From fc4c0bc42e32809eabf37bf378f16b394a71eae0 Mon Sep 17 00:00:00 2001
From: Yive <admin@yive.me>
Date: Sun, 24 Jan 2021 08:57:16 -0800
Subject: [PATCH] Reset shield blocking on dimension change

---
 ...-shield-blocking-on-dimension-change.patch | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch

diff --git a/Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch b/Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch
new file mode 100644
index 0000000000..47c51d6716
--- /dev/null
+++ b/Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Yive <admin@yive.me>
+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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+index 04d505c7a19775d0353c10424a84a1ce8885dc2c..baa82134d1f56a4d370db3012207e0f2b2fcd9ed 100644
+--- a/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/server/EntityPlayer.java
+@@ -989,6 +989,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+                 this.world.getServer().getPluginManager().callEvent(changeEvent);
+                 // CraftBukkit end
+             }
++            // Paper start
++            if (this.isBlocking()) {
++                this.clearActiveItem();
++            }
++            // Paper end
+ 
+             return this;
+         }