OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do not log throwable for duplicate entity adds

Browse source
This commit is contained in:
Spottedleaf 2022-09-29 08:53:33 -07:00
parent f044bd9e6c
commit 3acabf7aa9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/server/Rewrite-chunk-system.patch
View file

@ -2805,11 +2805,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ 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);