core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not log throwable for duplicate entity adds

This commit is contained in:
Spottedleaf 2022-09-29 08:53:33 -07:00
parent 8a7dd61348
commit 7d3a882670
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0016-Rewrite-chunk-system.patch
View File

@ -2437,7 +2437,7 @@ index 0000000000000000000000000000000000000000..dd501e83d991e45598509134fab05baf
+} +}
diff --git a/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java diff --git a/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..969f43ffc2e28aac45d1145d35ab37c8740b0880 index 0000000000000000000000000000000000000000..7d7540cb917564c497eb3a5ef98fb068944694ea
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java +++ b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java
@@ -0,0 +1,839 @@ @@ -0,0 +1,839 @@
@ -2805,11 +2805,11 @@ index 0000000000000000000000000000000000000000..969f43ffc2e28aac45d1145d35ab37c8
+ this.entityByLock.writeLock(); + this.entityByLock.writeLock();
+ try { + try {
+ if (this.entityById.containsKey(entity.getId())) { + if (this.entityById.containsKey(entity.getId())) {
+ LOGGER.warn("Entity id already exists: " + entity.getId() + ", mapped to " + this.entityById.get(entity.getId()) + ", can't add " + entity, new Throwable()); + LOGGER.warn("Entity id already exists: " + entity.getId() + ", mapped to " + this.entityById.get(entity.getId()) + ", can't add " + entity);
+ return false; + return false;
+ } + }
+ if (this.entityByUUID.containsKey(entity.getUUID())) { + if (this.entityByUUID.containsKey(entity.getUUID())) {
+ LOGGER.warn("Entity uuid already exists: " + entity.getUUID() + ", mapped to " + this.entityByUUID.get(entity.getUUID()) + ", can't add " + entity, new Throwable()); + LOGGER.warn("Entity uuid already exists: " + entity.getUUID() + ", mapped to " + this.entityByUUID.get(entity.getUUID()) + ", can't add " + entity);
+ return false; + return false;
+ } + }
+ this.entityById.put(entity.getId(), entity); + this.entityById.put(entity.getId(), entity);