mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
69 lines
3.7 KiB
Diff
69 lines
3.7 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/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
index 4918f89401cdf6a85d8b71f3e3a6608239a388bd..83df832b1fe5be1c1114ce3ae10c1985bf564a0c 100644
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
@@ -79,6 +79,7 @@ import net.minecraft.world.level.GameRules;
|
|
import net.minecraft.world.level.Level;
|
|
import net.minecraft.world.level.biome.BiomeManager;
|
|
import net.minecraft.world.level.block.Blocks;
|
|
+import net.minecraft.world.level.block.RespawnAnchorBlock;
|
|
import net.minecraft.world.level.block.state.BlockState;
|
|
import net.minecraft.world.level.border.BorderChangeListener;
|
|
import net.minecraft.world.level.border.WorldBorder;
|
|
@@ -830,6 +831,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
|
|
@@ -840,7 +842,7 @@ public abstract class PlayerList {
|
|
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();
|
|
}
|
|
@@ -883,7 +885,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 {
|
|
@@ -921,8 +928,12 @@ public abstract class PlayerList {
|
|
}
|
|
// entityplayer1.syncInventory();
|
|
entityplayer1.setHealth(entityplayer1.getHealth());
|
|
- if (flag2) {
|
|
- entityplayer1.connection.send(new ClientboundSoundPacket(SoundEvents.RESPAWN_ANCHOR_DEPLETE, SoundSource.BLOCKS, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), 1.0F, 1.0F));
|
|
+ // Paper start - Fix SPIGOT-5989
|
|
+ if (flag2 && !isLocAltered) {
|
|
+ BlockState data = worldserver1.getBlockState(blockposition);
|
|
+ worldserver1.setBlock(blockposition, data.setValue(RespawnAnchorBlock.CHARGE, data.getValue(RespawnAnchorBlock.CHARGE) - 1), 3);
|
|
+ entityplayer1.connection.send(new ClientboundSoundPacket(SoundEvents.RESPAWN_ANCHOR_DEPLETE, SoundSource.BLOCKS, (double) location.getX(), (double) location.getY(), (double) location.getZ(), 1.0F, 1.0F));
|
|
+ // Paper end
|
|
}
|
|
// Added from changeDimension
|
|
this.sendAllPlayerInfo(entityplayer); // Update health, etc...
|