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

23 lines
948 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
2023-09-22 22:13:57 +02:00
index fadfdb96ce9e0f449780c73a992c79691e4f8469..d76d7a9687df04b99b9116b2ec42263ec767b40f 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
2023-09-22 22:13:57 +02:00
@@ -1243,6 +1243,11 @@ public class ServerPlayer extends Player {
2023-06-08 02:54:54 +02:00
this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
2021-06-11 14:02:28 +02:00
// CraftBukkit end
}
+ // Paper start
+ if (this.isBlocking()) {
+ this.stopUsingItem();
+ }
+ // Paper end
return this;
}