alexander.nutz/barecopper
1
0
Fork 0
forked from EXTERNAL/bareiron
Code Pull Requests Activity

implement cactus damage

Browse Source 
* Added cactus damage for players and issues the respective death message.

Halts if condition is reached

* style nitpicks

---------

Co-authored-by: p2r3 <p2r3@p2r3.com>
This commit is contained in:
Henry Wandover
2025-09-15 14:30:33 -04:00
committed by GitHub
parent ff89519340
commit e5dfe53d14
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/globals.h
View File

@@ -142,6 +142,9 @@
// every time a block is broken. // every time a block is broken.
#define ENABLE_PICKUP_ANIMATION #define ENABLE_PICKUP_ANIMATION
// If defined, players are able to receive damage from nearby cacti.
#define ENABLE_CACTUS_DAMAGE
// If defined, logs unrecognized packet IDs // If defined, logs unrecognized packet IDs
// #define DEV_LOG_UNKNOWN_PACKETS // #define DEV_LOG_UNKNOWN_PACKETS

15
src/procedures.c
View File

@@ -1389,10 +1389,14 @@ void hurtEntity (int entity_id, int attacker_id, uint8_t damage_type, uint8_t da
strcpy((char *)recv_buffer + player_name_len, " was slain by "); strcpy((char *)recv_buffer + player_name_len, " was slain by ");
strcpy((char *)recv_buffer + player_name_len + 14, attacker->name); strcpy((char *)recv_buffer + player_name_len + 14, attacker->name);
recv_buffer[player_name_len + 14 + strlen(attacker->name)] = '\0'; recv_buffer[player_name_len + 14 + strlen(attacker->name)] = '\0';
} else if (damage_type == D_cactus) {
// Killed by being near a cactus
strcpy((char *)recv_buffer + player_name_len, " was pricked to death");
recv_buffer[player_name_len + 21] = '\0';
} else { } else {
// Unknown death reason // Unknown death reason
strcpy((char *)recv_buffer + player_name_len, " died"); strcpy((char *)recv_buffer + player_name_len, " died");
recv_buffer[player_name_len + 4] = '\0'; recv_buffer[player_name_len + 5] = '\0';
} }
} else player->health -= effective_damage; } else player->health -= effective_damage;
@@ -1502,6 +1506,15 @@ void handleServerTick (int64_t time_since_last_tick) {
if (block >= B_lava && block < B_lava + 4) { if (block >= B_lava && block < B_lava + 4) {
hurtEntity(player->client_fd, -1, D_lava, 8); hurtEntity(player->client_fd, -1, D_lava, 8);
} }
#ifdef ENABLE_CACTUS_DAMAGE
// Tick damage from a cactus block if one is under/inside or around the player.
if (block == B_cactus ||
getBlockAt(player->x + 1, player->y, player->z) == B_cactus ||
getBlockAt(player->x - 1, player->y, player->z) == B_cactus ||
getBlockAt(player->x, player->y, player->z + 1) == B_cactus ||
getBlockAt(player->x, player->y, player->z - 1) == B_cactus
) hurtEntity(player->client_fd, -1, D_cactus, 4);
#endif
// Heal from saturation if player is able and has enough food // Heal from saturation if player is able and has enough food
if (player->health >= 20 || player->health == 0) continue; if (player->health >= 20 || player->health == 0) continue;
if (player->hunger < 18) continue; if (player->hunger < 18) continue;