diff options
Diffstat (limited to 'patches/server/0498-Reset-shield-blocking-on-dimension-change.patch')
-rw-r--r-- | patches/server/0498-Reset-shield-blocking-on-dimension-change.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/server/0498-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0498-Reset-shield-blocking-on-dimension-change.patch new file mode 100644 index 0000000000..8d9b5e6d19 --- /dev/null +++ b/patches/server/0498-Reset-shield-blocking-on-dimension-change.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Yive <[email protected]> +Date: Sun, 24 Jan 2021 08:55:19 -0800 +Subject: [PATCH] Reset shield blocking on dimension change + + +diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java +index edfcfb91d907d6e1837e5a5d0e7abb8c8f6bcb66..2db78d991ef0595a0d8806414a959479e289c0fc 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +@@ -1265,6 +1265,11 @@ public class ServerPlayer extends Player { + this.level().getCraftServer().getPluginManager().callEvent(changeEvent); + // CraftBukkit end + } ++ // Paper start - Reset shield blocking on dimension change ++ if (this.isBlocking()) { ++ this.stopUsingItem(); ++ } ++ // Paper end - Reset shield blocking on dimension change + + return this; + } |