SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into pre/1.13

Browse Source 
* master:
  Duplicate UUID Resolve Option
  Add more information to Entity.toString
  change LAST_EDIT to PAPER_LAST_EDIT for edit commands
  Add more information to Entity.toString()
  Add Debug Entities option to debug dupe uuid issues
  Guard the Entity.SHARED_RANDOM from seed changes
  Create a symlink on not-windows to current minecraft decompile dir
This commit is contained in:
Aikar
2018-07-21 16:13:27 -04:00
parent 97d99711ff 51f03d3579
commit 7c13469d6c
9 changed files with 385 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Properly-remove-entities-on-dimension-teleport.patch
View File

@@ -42,7 +42,7 @@ index 4ac2d39c5..d6d3ffa6f 100644
}
protected void c(Entity entity) {
+ if (!entity.valid) return; // Paper - Already removed, dont fire twice - this looks like it can happen even without our changes
+ if (!this.entitiesByUUID.containsKey(entity.getUniqueID()) && !entity.valid) return; // Paper - Already removed, dont fire twice - this looks like it can happen even without our changes
super.c(entity);
this.entitiesById.d(entity.getId());
this.entitiesByUUID.remove(entity.getUniqueID());