Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 5c77bd28 SPIGOT-6147: InventoryCloseEvent does not fire after closing player inventory
62 lines
3.1 KiB
Diff
62 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: JRoy <joshroy126@gmail.com>
|
|
Date: Wed, 15 Jul 2020 21:42:52 -0400
|
|
Subject: [PATCH] Fix SPIGOT-5989
|
|
|
|
Before this fix, if a player was respawning to a respawn anchor and
|
|
the respawn location was modified away from the anchor with the
|
|
PlayerRespawnEvent, the anchor would still lose some charge.
|
|
This fixes that by checking if the modified spawn location is
|
|
still at a respawn anchor.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
|
index 52322b3e9963b9e1b899a84fbb95bbaf048f8ad6..41f55e575b26200809711637ded5c7cfd34b0d1f 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -770,6 +770,7 @@ public abstract class PlayerList {
|
|
// Paper start
|
|
boolean isBedSpawn = false;
|
|
boolean isRespawn = false;
|
|
+ boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
|
|
// Paper end
|
|
|
|
// CraftBukkit start - fire PlayerRespawnEvent
|
|
@@ -780,7 +781,7 @@ public abstract class PlayerList {
|
|
Optional optional;
|
|
|
|
if (blockposition != null) {
|
|
- optional = EntityHuman.getBed(worldserver1, blockposition, f, flag1, flag);
|
|
+ optional = EntityHuman.getBed(worldserver1, blockposition, f, flag1, true); // Paper - Fix SPIGOT-5989
|
|
} else {
|
|
optional = Optional.empty();
|
|
}
|
|
@@ -823,7 +824,12 @@ public abstract class PlayerList {
|
|
}
|
|
// Spigot End
|
|
|
|
- location = respawnEvent.getRespawnLocation();
|
|
+ // Paper start - Fix SPIGOT-5989
|
|
+ if (!location.equals(respawnEvent.getRespawnLocation()) ) {
|
|
+ location = respawnEvent.getRespawnLocation();
|
|
+ isLocAltered = true;
|
|
+ }
|
|
+ // Paper end
|
|
if (!flag) entityplayer.reset(); // SPIGOT-4785
|
|
isRespawn = true; // Paper
|
|
} else {
|
|
@@ -861,8 +867,12 @@ public abstract class PlayerList {
|
|
}
|
|
// entityplayer1.syncInventory();
|
|
entityplayer1.setHealth(entityplayer1.getHealth());
|
|
- if (flag2) {
|
|
- entityplayer1.playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(SoundEffects.BLOCK_RESPAWN_ANCHOR_DEPLETE, SoundCategory.BLOCKS, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), 1.0F, 1.0F));
|
|
+ // Paper start - Fix SPIGOT-5989
|
|
+ if (flag2 && !isLocAltered) {
|
|
+ IBlockData data = worldserver1.getType(blockposition);
|
|
+ worldserver1.setTypeAndData(blockposition, data.set(BlockRespawnAnchor.a, data.get(BlockRespawnAnchor.a) - 1), 3);
|
|
+ entityplayer1.playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(SoundEffects.BLOCK_RESPAWN_ANCHOR_DEPLETE, SoundCategory.BLOCKS, (double) location.getX(), (double) location.getY(), (double) location.getZ(), 1.0F, 1.0F));
|
|
+ // Paper end
|
|
}
|
|
// Added from changeDimension
|
|
updateClient(entityplayer); // Update health, etc...
|