aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSpottedleaf <[email protected]>2022-09-29 08:53:33 -0700
committerSpottedleaf <[email protected]>2022-09-29 08:55:47 -0700
commit7d3a882670e05e7006e5eabe3a0027796190f1e9 (patch)
treee64e3796189b2f01f2988a319e4335138dce9217
parent8a7dd613487ea3abe0180fdf95ecaadbaa2144a6 (diff)
downloadPaper-7d3a882670e05e7006e5eabe3a0027796190f1e9.tar.gz
Paper-7d3a882670e05e7006e5eabe3a0027796190f1e9.zip
Do not log throwable for duplicate entity adds
-rw-r--r--patches/server/0016-Rewrite-chunk-system.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0016-Rewrite-chunk-system.patch b/patches/server/0016-Rewrite-chunk-system.patch
index 3cd52368ed..02c78951c7 100644
--- a/patches/server/0016-Rewrite-chunk-system.patch
+++ b/patches/server/0016-Rewrite-chunk-system.patch
@@ -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
new file mode 100644
-index 0000000000000000000000000000000000000000..969f43ffc2e28aac45d1145d35ab37c8740b0880
+index 0000000000000000000000000000000000000000..7d7540cb917564c497eb3a5ef98fb068944694ea
--- /dev/null
+++ b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java
@@ -0,0 +1,839 @@
@@ -2805,11 +2805,11 @@ index 0000000000000000000000000000000000000000..969f43ffc2e28aac45d1145d35ab37c8
+ this.entityByLock.writeLock();
+ try {
+ 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;
+ }
+ 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;
+ }
+ this.entityById.put(entity.getId(), entity);