Paper/patches/server/0501-Reset-shield-blocking-on-dimension-change.patch

23 lines
1.0 KiB
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
2024-04-24 15:46:45 +02:00
index edfcfb91d907d6e1837e5a5d0e7abb8c8f6bcb66..2db78d991ef0595a0d8806414a959479e289c0fc 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
2024-04-24 15:46:45 +02:00
@@ -1265,6 +1265,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 - Reset shield blocking on dimension change
2021-06-11 14:02:28 +02:00
+ if (this.isBlocking()) {
+ this.stopUsingItem();
+ }
+ // Paper end - Reset shield blocking on dimension change
2021-06-11 14:02:28 +02:00
return this;
}