2021-06-11 12:02:28 +00:00
|
|
|
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
|
2022-03-16 15:57:51 +00:00
|
|
|
index f343a52a325aa338a590ec8e35c0fa2a7f4703f3..95f339da3a6978da3e1bcd7e6cd1c6b70cbe91aa 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2022-03-16 15:57:51 +00:00
|
|
|
@@ -1168,6 +1168,11 @@ public class ServerPlayer extends Player {
|
2021-06-11 12:02:28 +00:00
|
|
|
this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
|
|
|
|
// CraftBukkit end
|
|
|
|
}
|
|
|
|
+ // Paper start
|
|
|
|
+ if (this.isBlocking()) {
|
|
|
|
+ this.stopUsingItem();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
return this;
|
|
|
|
}
|