Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)

This commit is contained in:
Jake Potrebic 2022-01-22 16:59:56 -08:00 committed by GitHub
parent 60e46abb00
commit 512995c2a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
108 changed files with 345 additions and 363 deletions

View file

@ -26,7 +26,7 @@ index 00ef714294b6cce5fec7613eed4ba228a48e3e11..67b300574655854249c1f7440f56a6e8
uniqueId = gameProfile.getId();
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 4061b79b55d0ef3221f74d5cb410f8a1574fd8d2..b62925af7a2c9fda30b5d23ab12375ae1fd17ea2 100644
index bc31a9d5f709362f986ce4132287746568bafa56..b808a8f5b1a2e663924b22aa0d65459abd9f865d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -72,6 +72,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
@ -37,7 +37,7 @@ index 4061b79b55d0ef3221f74d5cb410f8a1574fd8d2..b62925af7a2c9fda30b5d23ab12375ae
import net.minecraft.world.level.block.entity.SignBlockEntity;
import net.minecraft.world.level.saveddata.maps.MapDecoration;
import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
@@ -1372,8 +1373,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1380,8 +1381,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.hiddenEntities.put(entity.getUniqueId(), hidingPlugins);
// Remove this entity from the hidden player's EntityTrackerEntry
@ -52,7 +52,7 @@ index 4061b79b55d0ef3221f74d5cb410f8a1574fd8d2..b62925af7a2c9fda30b5d23ab12375ae
ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
if (entry != null) {
entry.removePlayer(this.getHandle());
@@ -1422,8 +1428,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1430,8 +1436,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
this.hiddenEntities.remove(entity.getUniqueId());
@ -67,7 +67,7 @@ index 4061b79b55d0ef3221f74d5cb410f8a1574fd8d2..b62925af7a2c9fda30b5d23ab12375ae
if (other instanceof ServerPlayer) {
ServerPlayer otherPlayer = (ServerPlayer) other;
@@ -1435,6 +1446,50 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1443,6 +1454,50 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
entry.updatePlayer(this.getHandle());
}
}