add missing creating mode checks here

This commit is contained in:
hyperdefined
2026-04-03 19:04:40 -04:00
parent 772acf4332
commit 46db1af915

View File

@@ -77,6 +77,9 @@ public class EntityDamage implements Listener {
if (playerBeingAttacked) { if (playerBeingAttacked) {
Player player = (Player) event.getEntity(); Player player = (Player) event.getEntity();
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
return;
}
if (player.isBlocking()) { if (player.isBlocking()) {
double blockedDamage = -event.getDamage(EntityDamageEvent.DamageModifier.BLOCKING); double blockedDamage = -event.getDamage(EntityDamageEvent.DamageModifier.BLOCKING);
updateShieldDamage(player.getInventory(), blockedDamage); updateShieldDamage(player.getInventory(), blockedDamage);
@@ -86,6 +89,9 @@ public class EntityDamage implements Listener {
// player attacks something // player attacks something
if (playerAttacking) { if (playerAttacking) {
Player player = (Player) damager; Player player = (Player) damager;
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
return;
}
PlayerInventory playerAttackingInventory = player.getInventory(); PlayerInventory playerAttackingInventory = player.getInventory();
// make sure the item the player used is an item we want // make sure the item the player used is an item we want
if (!toolStats.itemChecker.isMeleeWeapon(playerAttackingInventory.getItemInMainHand().getType())) { if (!toolStats.itemChecker.isMeleeWeapon(playerAttackingInventory.getItemInMainHand().getType())) {
@@ -125,6 +131,9 @@ public class EntityDamage implements Listener {
if (damager instanceof Trident trident) { if (damager instanceof Trident trident) {
ProjectileSource source = trident.getShooter(); ProjectileSource source = trident.getShooter();
if (source instanceof Player player) { if (source instanceof Player player) {
if (player.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
return;
}
// update the trident's tracked damage // update the trident's tracked damage
updateTridentDamage(trident, finalDamage); updateTridentDamage(trident, finalDamage);
@@ -156,6 +165,9 @@ public class EntityDamage implements Listener {
// a player shot the arrow // a player shot the arrow
if (source instanceof Player shootingPlayer) { if (source instanceof Player shootingPlayer) {
if (shootingPlayer.getGameMode() == GameMode.CREATIVE && !toolStats.config.getBoolean("allow-creative")) {
return;
}
// update the player's bow damage // update the player's bow damage
updateBowDamage(shootingPlayer.getInventory(), finalDamage); updateBowDamage(shootingPlayer.getInventory(), finalDamage);