ea855e2b46
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes: d3ed1516 Fix dangerously threaded beacons 217a293d Don't relocate joptsimple to allow --help to work. 1be05a21 Prepare for imminent Java 12 release a49270b2 Mappings Update 5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
49 lines
1.9 KiB
Diff
49 lines
1.9 KiB
Diff
From 9ccdc6edf0547373e3e6ffd692099c5f54b4a069 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 10 Jun 2018 20:20:15 -0400
|
|
Subject: [PATCH] Fix CraftEntity hashCode
|
|
|
|
hashCodes are not allowed to change, however bukkit used a value
|
|
that does change, the entityId.
|
|
|
|
When an entity is teleported dimensions, the entity reference is
|
|
replaced with a new one with a new entity ID.
|
|
|
|
For hashCode, we can simply use the UUID's hashCode to keep
|
|
the hashCode from changing.
|
|
|
|
equals() is ok to use getEntityId() because equals() should only
|
|
be true if both the left and right are the same reference.
|
|
|
|
Since entity ids can not duplicate during runtime, this
|
|
check is essentially the same as this.getHandle() == other.getHandle()
|
|
|
|
However, replaced it too to make it clearer of intent.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
index 67530ba0f..d4a8fb16b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -542,14 +542,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
|
return false;
|
|
}
|
|
final CraftEntity other = (CraftEntity) obj;
|
|
- return (this.getEntityId() == other.getEntityId());
|
|
+ return (this.getHandle() == other.getHandle()); // Paper - while logically the same, this is clearer
|
|
}
|
|
|
|
+ // Paper - Fix hashCode. entity ID's are not static.
|
|
+ // A CraftEntity can change reference to a new entity with a new ID, and hash codes should never change
|
|
@Override
|
|
public int hashCode() {
|
|
- int hash = 7;
|
|
- hash = 29 * hash + this.getEntityId();
|
|
- return hash;
|
|
+ return getUniqueId().hashCode();
|
|
+ // Paper end
|
|
}
|
|
|
|
public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
|
|
--
|
|
2.21.0
|
|
|