aa52bf9e33
Mojang made some changes to priorities in 1.17 and it seems that these changes conflict with the changes made in this patch, which in some cases appears to cause excessive rescheduling of tasks. This, however, is not confirmed as such but seems to be the behavior that we're seeing to cause this issue, if mojang has adopted the changes we suggested, then a good chunk of this patch may be unneeded, but, this needs a much better look than I'm currently able to do
70 lines
3.7 KiB
Diff
70 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 e0c9857a922d8a3f421d7df0f056b82c4775390e..82a646365b5b0619825995c722cf773bf23b64ae 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;
|
|
@@ -829,6 +830,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
|
|
@@ -839,7 +841,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();
|
|
}
|
|
@@ -882,7 +884,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 {
|
|
@@ -919,8 +926,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...
|