PaperMC/patches/server/0562-Reset-shield-blocking-on-dimension-change.patch

23 lines
946 B
Diff
Raw Normal View History

2021-06-11 14:02:28 +02: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-12-07 21:16:54 +01:00
index c3ad00123198dc00bcf5a3d89f8d527b1c9c083c..c288075547cea04e0a1aba66b496c8bd5c2acd42 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
2022-12-07 21:16:54 +01:00
@@ -1188,6 +1188,11 @@ public class ServerPlayer extends Player {
2021-06-11 14:02:28 +02:00
this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
// CraftBukkit end
}
+ // Paper start
+ if (this.isBlocking()) {
+ this.stopUsingItem();
+ }
+ // Paper end
return this;
}