Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
62 Zeilen
3.4 KiB
Diff
62 Zeilen
3.4 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 354719476074acc75b35f8e4a06f0363bd13a3f3..db03f510195981e9f860ce2fdc59d0a70283dc14 100644
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
@@ -842,6 +842,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
|
|
@@ -852,7 +853,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();
|
|
}
|
|
@@ -896,7 +897,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 {
|
|
@@ -934,8 +940,12 @@ public abstract class PlayerList {
|
|
}
|
|
// entityplayer1.initInventoryMenu();
|
|
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, worldserver1.getRandom().nextLong()));
|
|
+ // Paper start - Fix SPIGOT-5989
|
|
+ if (flag2 && !isLocAltered) {
|
|
+ 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);
|
|
+ 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
|
|
}
|
|
// Added from changeDimension
|
|
this.sendAllPlayerInfo(entityplayer); // Update health, etc...
|