mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-19 10:35:03 +02:00
de04cbced5
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: f29cb801 Separate checkstyle-suppressions file is not required 86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack 9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode() 994a6163 Attempt upgrade of resolver libraries CraftBukkit Changes: b3b43a6ad Add Checkstyle check for unused imports 13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names 3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API 2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor 1dbdbbed4 PR-1238: Remove unnecessary sign ticking 659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper e37e29ce0 Increase outdated build delay c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack 492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode() e11fbb9d7 Upgrade MySQL driver 9f3a0bd2a Attempt upgrade of resolver libraries 60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion Spigot Changes: 06d602e7 Rebuild patches
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 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 b96f65776155f57d599a0a0d06456c95088d38fb..594eeb83425787e160f8051f15c7cdf61a7bb090 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -499,14 +499,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
|