mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-18 20:53:09 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
22 lines
1.2 KiB
Diff
22 lines
1.2 KiB
Diff
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 46de03e961438faaf44b8bd39aed7535daef1bf9..5571e89876317e7b4b304bb1ec9c31078d0f69ee 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -1613,6 +1613,11 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
|
|
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
|
|
this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
|
|
// CraftBukkit end
|
|
+ // Paper start - Reset shield blocking on dimension change
|
|
+ if (this.isBlocking()) {
|
|
+ this.stopUsingItem();
|
|
+ }
|
|
+ // Paper end - Reset shield blocking on dimension change
|
|
return this;
|
|
}
|
|
}
|