Paper/patches/server/0401-Fix-SPIGOT-5989.patch

64 lines
3.5 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
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/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
2024-04-24 08:44:48 +02:00
index 48f3e51d8904a51f146e9b8c8fe195ef012fecd8..7af0239dbcaf46ee9f793072e832978400cdee0c 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
2024-04-24 08:44:48 +02:00
@@ -804,6 +804,7 @@ public abstract class PlayerList {
// Paper start - Add PlayerPostRespawnEvent
2021-06-11 14:02:28 +02:00
boolean isBedSpawn = false;
boolean isRespawn = false;
+ boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
// Paper end - Add PlayerPostRespawnEvent
2021-06-11 14:02:28 +02:00
// CraftBukkit start - fire PlayerRespawnEvent
2024-04-24 08:44:48 +02:00
@@ -814,7 +815,7 @@ public abstract class PlayerList {
2021-06-11 14:02:28 +02:00
Optional optional;
if (blockposition != null) {
- optional = net.minecraft.world.entity.player.Player.findRespawnPositionAndUseSpawnBlock(worldserver1, blockposition, f, flag1, flag);
+ optional = net.minecraft.world.entity.player.Player.findRespawnPositionAndUseSpawnBlock(worldserver1, blockposition, f, flag1, true); // Paper - Fix SPIGOT-5989
} else {
optional = Optional.empty();
}
2024-04-24 08:44:48 +02:00
@@ -858,7 +859,12 @@ public abstract class PlayerList {
2021-06-11 14:02:28 +02:00
}
// Spigot End
- location = respawnEvent.getRespawnLocation();
+ // Paper start - Fix SPIGOT-5989
+ if (!location.equals(respawnEvent.getRespawnLocation()) ) {
+ location = respawnEvent.getRespawnLocation();
+ isLocAltered = true;
+ }
+ // Paper end - Fix SPIGOT-5989
2021-06-11 14:02:28 +02:00
if (!flag) entityplayer.reset(); // SPIGOT-4785
isRespawn = true; // Paper - Add PlayerPostRespawnEvent
2021-06-11 14:02:28 +02:00
} else {
2024-04-24 08:44:48 +02:00
@@ -896,8 +902,14 @@ public abstract class PlayerList {
2021-06-11 14:02:28 +02:00
}
// entityplayer1.initInventoryMenu();
2021-06-11 14:02:28 +02:00
entityplayer1.setHealth(entityplayer1.getHealth());
- if (flag2) {
2022-06-08 07:46:52 +02:00
- entityplayer1.connection.send(new ClientboundSoundPacket(SoundEvents.RESPAWN_ANCHOR_DEPLETE, SoundSource.BLOCKS, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), 1.0F, 1.0F, worldserver1.getRandom().nextLong()));
2021-06-11 14:02:28 +02:00
+ // Paper start - Fix SPIGOT-5989
+ if (flag2 && !isLocAltered) {
+ if (!flag1) {
+ BlockState data = worldserver1.getBlockState(blockposition);
+ worldserver1.setBlock(blockposition, data.setValue(net.minecraft.world.level.block.RespawnAnchorBlock.CHARGE, data.getValue(net.minecraft.world.level.block.RespawnAnchorBlock.CHARGE) - 1), 3);
+ }
2022-06-08 07:46:52 +02:00
+ entityplayer1.connection.send(new ClientboundSoundPacket(SoundEvents.RESPAWN_ANCHOR_DEPLETE, SoundSource.BLOCKS, (double) location.getX(), (double) location.getY(), (double) location.getZ(), 1.0F, 1.0F, worldserver1.getRandom().nextLong()));
+ // Paper end - Fix SPIGOT-5989
2021-06-11 14:02:28 +02:00
}
// Added from changeDimension
2021-06-14 12:42:08 +02:00
this.sendAllPlayerInfo(entityplayer); // Update health, etc...