1 files changed, 22 insertions, 0 deletions
diff --git a/patches/server/0506-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0506-Reset-shield-blocking-on-dimension-change.patch
new file mode 100644
index 0000000000..b59a53ac0f
--- /dev/null
+++ b/patches/server/0506-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 6e62c5037a69468e7b4c8115a6623d48538de307..8c65b05e66372cf3c92f823d72e94c18fe77622b 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -1198,6 +1198,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;
+         }