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-28 03:00:01 +02:00
|
|
|
index c4ba4b378aee28e7479207aff46c27307bd6b105..7eab41ac49707a52adcfd6fb3c3d70cff3a4ad1b 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-28 03:00:01 +02:00
|
|
|
@@ -1275,6 +1275,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;
|
|
|
|
}
|