mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
bd38e0318a
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f02baa38 PR-988: Add World#getIntersectingChunks(BoundingBox) 9321d665 Move getItemInUse up to LivingEntity 819eef73 PR-959: Add access to current item's remaining ticks c4fdadb0 SPIGOT-7601: Add AbstractArrow#getItem be8261ca Add support for Java 22 26119676 PR-979: Add more translation keys 66753362 PR-985: Correct book maximum pages and characters per page documentation c8be92fa PR-980: Improve getArmorContents() documentation f1120ee2 PR-983: Expose riptide velocity to PlayerRiptideEvent CraftBukkit Changes: dfaa89bbe PR-1369: Add World#getIntersectingChunks(BoundingBox) 51bbab2b9 Move getItemInUse up to LivingEntity 668e09602 PR-1331: Add access to current item's remaining ticks a639406d1 SPIGOT-7601: Add AbstractArrow#getItem 0398930fc SPIGOT-7602: Allow opening in-world horse and related inventories ffd15611c SPIGOT-7608: Allow empty lists to morph to any PDT list 2188dcfa9 Add support for Java 22 45d6a609f SPIGOT-7604: Revert "SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime" 06d915943 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime ca3bc3707 PR-1361: Add more translation keys 366c3ca80 SPIGOT-7600: EntityChangeBlockEvent is not fired for frog eggs 06d0f9ba8 SPIGOT-7593: Fix sapling growth physics / client-side updates 45c2608e4 PR-1366: Expose riptide velocity to PlayerRiptideEvent 29b6bb79b SPIGOT-7587: Remove fixes for now-resolved MC-142590 and MC-109346
81 lines
4.3 KiB
Diff
81 lines
4.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cryptite <cryptite@gmail.com>
|
|
Date: Mon, 1 May 2023 16:22:43 -0500
|
|
Subject: [PATCH] Add PlayerShieldDisableEvent
|
|
|
|
Called whenever a players shield is disabled. This is mainly caused by
|
|
attacking players or monsters that carry axes.
|
|
|
|
The event, while similar to the PlayerItemCooldownEvent, offers other
|
|
behaviour and can hence not be implemented as a childtype of said event.
|
|
Specifically, cancelling the event prevents the game events from being
|
|
sent to the player.
|
|
|
|
Plugins listening to just the PlayerItemCooldownEvent may not want said
|
|
sideeffects, meaning the disable event cannot share a handlerlist with
|
|
the cooldown event
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
|
index 4e8aee81cb9e9fe4a4e5df4e228c0314b3af486b..544e22f569d7ddeb1ba46a9ef7f4d4d6ca37c431 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
|
@@ -1698,7 +1698,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
|
|
float f = 0.25F + (float) EnchantmentHelper.getBlockEfficiency(this) * 0.05F;
|
|
|
|
if (this.random.nextFloat() < f) {
|
|
- player.getCooldowns().addCooldown(Items.SHIELD, 100);
|
|
+ // Paper start - Add PlayerShieldDisableEvent
|
|
+ final 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;
|
|
+ player.getCooldowns().addCooldown(Items.SHIELD, shieldDisableEvent.getCooldown());
|
|
+ // Paper end - Add PlayerShieldDisableEvent
|
|
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 020b74065f7489a46b70ac52e5abbdb22132f8d8..3e9c6e7e356ac08ec41736eaabf38714a8841d18 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
@@ -973,7 +973,7 @@ public abstract class Player extends LivingEntity {
|
|
protected void blockUsingShield(LivingEntity attacker) {
|
|
super.blockUsingShield(attacker);
|
|
if (attacker.canDisableShield()) {
|
|
- this.disableShield(true);
|
|
+ this.disableShield(true, attacker); // Paper - Add PlayerShieldDisableEvent
|
|
}
|
|
|
|
}
|
|
@@ -1456,7 +1456,14 @@ public abstract class Player extends LivingEntity {
|
|
this.attack(target);
|
|
}
|
|
|
|
+ @io.papermc.paper.annotation.DoNotUse @Deprecated // Paper - Add PlayerShieldDisableEvent
|
|
public void disableShield(boolean sprinting) {
|
|
+ // Paper start - Add PlayerShieldDisableEvent
|
|
+ disableShield(sprinting, null);
|
|
+ }
|
|
+
|
|
+ public void disableShield(boolean sprinting, @Nullable LivingEntity attacker) {
|
|
+ // Paper end - Add PlayerShieldDisableEvent
|
|
float f = 0.25F + (float) EnchantmentHelper.getBlockEfficiency(this) * 0.05F;
|
|
|
|
if (sprinting) {
|
|
@@ -1464,7 +1471,16 @@ public abstract class Player extends LivingEntity {
|
|
}
|
|
|
|
if (this.random.nextFloat() < f) {
|
|
- this.getCooldowns().addCooldown(Items.SHIELD, 100);
|
|
+ // Paper start - Add PlayerShieldDisableEvent
|
|
+ final org.bukkit.entity.Entity finalAttacker = attacker != null ? attacker.getBukkitEntity() : null;
|
|
+ if (finalAttacker != null) {
|
|
+ final 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());
|
|
+ } else {
|
|
+ this.getCooldowns().addCooldown(Items.SHIELD, 100);
|
|
+ }
|
|
+ // Paper end - Add PlayerShieldDisableEvent
|
|
this.stopUsingItem();
|
|
this.level().broadcastEntityEvent(this, (byte) 30);
|
|
}
|