From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cryptite Date: Sun, 27 Feb 2022 09:47:57 -0600 Subject: [PATCH] Add PlayerShieldDisableEvent diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java index e3227a806d9e19923783122ea94ae19e7dbe71da..61ad475364346efe7cf3f3d8db07753075d6edb9 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1608,7 +1608,10 @@ public abstract class Mob extends LivingEntity { float f = 0.25F + (float) EnchantmentHelper.getBlockEfficiency(this) * 0.05F; if (this.random.nextFloat() < f) { - player.getCooldowns().addCooldown(Items.SHIELD, 100); + //Slice start + io.papermc.paper.event.player.PlayerShieldDisableEvent shieldDisableEvent = new io.papermc.paper.event.player.PlayerShieldDisableEvent((org.bukkit.entity.Player) player.getBukkitEntity(), getBukkitEntity(), 100); + if (!shieldDisableEvent.callEvent()) return; // Slice + player.getCooldowns().addCooldown(Items.SHIELD, shieldDisableEvent.getCooldown()); this.level.broadcastEntityEvent(player, (byte) 30); } } diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java index 2483d7df7f1bf94344afd38b37602c645a4a2dff..0156525637f8aa2e4e639bc493d8617b5af4cc32 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -949,7 +949,7 @@ public abstract class Player extends LivingEntity { protected void blockUsingShield(LivingEntity attacker) { super.blockUsingShield(attacker); if (attacker.getMainHandItem().getItem() instanceof AxeItem) { - this.disableShield(true); + this.disableShield(true, attacker); // Slice } } @@ -1420,6 +1420,12 @@ public abstract class Player extends LivingEntity { } public void disableShield(boolean sprinting) { + // Slice start + disableShield(sprinting, null); + } + + public void disableShield(boolean sprinting, @Nullable LivingEntity attacker) { + // Slice end float f = 0.25F + (float) EnchantmentHelper.getBlockEfficiency(this) * 0.05F; if (sprinting) { @@ -1427,7 +1433,12 @@ public abstract class Player extends LivingEntity { } if (this.random.nextFloat() < f) { - this.getCooldowns().addCooldown(Items.SHIELD, 100); + // Slice start + org.bukkit.entity.Entity finalAttacker = attacker != null ? attacker.getBukkitEntity() : null; + io.papermc.paper.event.player.PlayerShieldDisableEvent shieldDisableEvent = new io.papermc.paper.event.player.PlayerShieldDisableEvent((org.bukkit.entity.Player) getBukkitEntity(), finalAttacker, 100); + if (!shieldDisableEvent.callEvent()) return; + this.getCooldowns().addCooldown(Items.SHIELD, shieldDisableEvent.getCooldown()); + // Slice end this.stopUsingItem(); this.level.broadcastEntityEvent(this, (byte) 30); }