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/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c4ba4b378aee28e7479207aff46c27307bd6b105..7eab41ac49707a52adcfd6fb3c3d70cff3a4ad1b 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1275,6 +1275,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;
         }