23 lines
975 B
Diff
23 lines
975 B
Diff
|
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 ff831ca0cbc0cabbf78178c609ccf70d78da7980..314f168c9d17ab3654c9dda07e48839570f0d332 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
@@ -1115,6 +1115,11 @@ public class ServerPlayer extends Player implements ContainerListener {
|
||
|
|
this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
|
||
|
|
// CraftBukkit end
|
||
|
|
}
|
||
|
|
+ // Paper start
|
||
|
|
+ if (this.isBlocking()) {
|
||
|
|
+ this.stopUsingItem();
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
return this;
|
||
|
|
}
|