EXTERNAL/bareiron
1
0
Fork 1
mirror of https://github.com/p2r3/bareiron.git synced 2025-10-02 07:35:08 +02:00
Code Issues Activity

fix wrong player handles in player combat

Browse Source
This commit is contained in:
p2r3
2025-08-28 02:04:20 +03:00
parent 728195b48f
commit de501afb1c
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/procedures.c
View File

@@ -935,15 +935,9 @@ void spawnMob (uint8_t type, short x, uint8_t y, short z, uint8_t health) {
void hurtEntity (int entity_id, int attacker_id, uint8_t damage_type, uint8_t damage) { void hurtEntity (int entity_id, int attacker_id, uint8_t damage_type, uint8_t damage) {
// Retrieve player data if applicable
PlayerData *player;
if (attacker_id < 65536 && attacker_id != -1) {
if (getPlayerData(attacker_id, &player)) return;
} else if (entity_id < 65536) {
if (getPlayerData(entity_id, &player)) return;
}
if (attacker_id < 65536 && attacker_id != -1) { // Attacker is a player if (attacker_id < 65536 && attacker_id != -1) { // Attacker is a player
PlayerData *player;
if (getPlayerData(attacker_id, &player)) return;
// Check if attack cooldown flag is set // Check if attack cooldown flag is set
if (player->flags & 0x01) return; if (player->flags & 0x01) return;
// Scale damage based on held item // Scale damage based on held item
@@ -963,6 +957,9 @@ void hurtEntity (int entity_id, int attacker_id, uint8_t damage_type, uint8_t da
uint8_t entity_died = false; uint8_t entity_died = false;
if (entity_id < 65536) { // The attacked entity is a player if (entity_id < 65536) { // The attacked entity is a player
PlayerData *player;
if (getPlayerData(entity_id, &player)) return;
// Update health on the server
if (player->health <= damage) { if (player->health <= damage) {
player->health = 0; player->health = 0;
entity_died = true; entity_died = true;
@@ -977,13 +974,17 @@ void hurtEntity (int entity_id, int attacker_id, uint8_t damage_type, uint8_t da
mob->y = 0; mob->y = 0;
entity_died = true; entity_died = true;
// Handle mob drops // Handle mob drops
if (attacker_id < 65536) switch (mob->type) { if (attacker_id < 65536 && attacker_id != -1) {
case 25: givePlayerItem(player, I_chicken, 1); break; PlayerData *player;
case 28: givePlayerItem(player, I_beef, 1 + (fast_rand() % 3)); break; if (getPlayerData(attacker_id, &player)) return;
case 95: givePlayerItem(player, I_porkchop, 1 + (fast_rand() % 3)); break; switch (mob->type) {
case 106: givePlayerItem(player, I_mutton, 1 + (fast_rand() & 1)); break; case 25: givePlayerItem(player, I_chicken, 1); break;
case 145: givePlayerItem(player, I_rotten_flesh, (fast_rand() % 3)); break; case 28: givePlayerItem(player, I_beef, 1 + (fast_rand() % 3)); break;
default: break; case 95: givePlayerItem(player, I_porkchop, 1 + (fast_rand() % 3)); break;
case 106: givePlayerItem(player, I_mutton, 1 + (fast_rand() & 1)); break;
case 145: givePlayerItem(player, I_rotten_flesh, (fast_rand() % 3)); break;
default: break;
}
} }
} else mob->data -= damage; } else mob->data -= damage;
} }