Skip to content

Commit fe94cec

Browse files
committed
feat: add option to disable contact damage
1 parent 37806bf commit fe94cec

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/main/java/me/zetastormy/akropolis/module/modules/world/WorldProtect.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public class WorldProtect extends Module {
9090
private boolean playerPvP;
9191
private boolean playerDrowning;
9292
private boolean fireDamage;
93+
private boolean contactDamage;
9394
private boolean inventoryDrop;
9495

9596
private static final Set<Material> INTERACTABLE;
@@ -204,6 +205,7 @@ public void onEnable() {
204205
leafDecay = config.getBoolean("world_settings.disable_block_leaf_decay");
205206
playerDrowning = config.getBoolean("world_settings.disable_drowning");
206207
fireDamage = config.getBoolean("world_settings.disable_fire_damage");
208+
contactDamage = config.getBoolean("world_settings.disable_contact_damage", true);
207209
inventoryDrop = config.getBoolean("world_settings.disable_inventory_drop", true);
208210
}
209211

@@ -399,6 +401,8 @@ public void onEntityDamage(EntityDamageEvent event) {
399401

400402
if (fallDamage && event.getCause() == EntityDamageEvent.DamageCause.FALL) {
401403
event.setCancelled(true);
404+
} else if (contactDamage && event.getCause() == EntityDamageEvent.DamageCause.CONTACT) {
405+
event.setCancelled(true);
402406
} else if (playerDrowning && event.getCause() == EntityDamageEvent.DamageCause.DROWNING) {
403407
event.setCancelled(true);
404408
} else if (fireDamage && (event.getCause() == EntityDamageEvent.DamageCause.FIRE

src/main/resources/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ world_settings:
415415
disable_player_pvp: true
416416
disable_void_death: true
417417
disable_fire_damage: true
418+
disable_contact_damage: true # Cactus, dripstone and others
418419
disable_drowning: true
419420
disable_off_hand_swap: true
420421

0 commit comments

Comments
 (0)