From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Yive 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 090ff649eeef45fe4c0403a171e5eddff12d2c7d..9db7bfe3782e96921e3a65ed60f4494770210d5a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1247,6 +1247,11 @@ public class ServerPlayer extends Player { this.level().getCraftServer().getPluginManager().callEvent(changeEvent); // CraftBukkit end } + // Paper start + if (this.isBlocking()) { + this.stopUsingItem(); + } + // Paper end return this; }