PaperMC/patches/server/0580-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
index 2ff8d16cf94ab1c7b0f42657e8fb2f3b4aa8a1e2..a6a14bf7221dbbb7a1ef42ba8961711e60aa0bf2 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-06-08 09:40:34 +02:00
@@ -1182,6 +1182,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;
}