Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 20:40:07 +01:00
c68dbb864c
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Bukkit Changes: 6527cb58 SPIGOT-5329: Clarify isGlowing documentation 5ddb414f Make Lantern extend BlockData cb888903 Fix typos in previous commits 2a5e0ca2 Bring EnchantItemEvent documentation in line with EnchantmentOffer 3c5fcea2 SPIGOT-5317: Create accessors for player absorption hearts c6e0d625 SPIGOT-5320: Clarify scope of ExactChoice CraftBukkit Changes:a3fdef8cSPIGOT-5331: Add support for Java 136ddeb980SPIGOT-5317: Create accessors for player absorption hearts5d335e96SPIGOT-5315: Cannot serialize armor stand ItemMeta Spigot Changes: 94af569b SPIGOT-5319: Async catcher for getNearbyEntities
50 Zeilen
1.8 KiB
Diff
50 Zeilen
1.8 KiB
Diff
From c08536aeb0cb0387c9b623a5b4df96df67131771 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 09ca9a3eb..517e42218 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -721,14 +721,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
|
|
}
|
|
|
|
@Override
|
|
--
|
|
2.22.1
|
|
|