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-01-24 15:57:53 +01:00
|
|
|
index 58bbf3176f405c3c31007780368a3e16948382a7..4b4f5fcb51b54981d81924e3d1b9ff091e2c5ae5 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-01-24 15:57:53 +01:00
|
|
|
@@ -1199,6 +1199,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
|
|
|
|
}
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Reset shield blocking on dimension change
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (this.isBlocking()) {
|
|
|
|
+ this.stopUsingItem();
|
|
|
|
+ }
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Reset shield blocking on dimension change
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
return this;
|
|
|
|
}
|