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

Merge branch 'master' into pre/1.13

Browse Source 
* master:
  MC-135506: Experience should save as Integers
  Fix EXP orb merging causing values to go negative - Closes #1169
  Add "Safe Regen" Duplicate UUID resolver and make default
This commit is contained in:
Aikar
2018-08-03 01:29:20 -04:00
parent e966ee5aef 3522a633d6
commit c4fd14d690
13 changed files with 91 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Always-process-chunk-removal-in-removeEntity.patch
View File

@@ -8,7 +8,7 @@ which can keep them in the chunk when they shouldnt be if done
during entity ticking.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 89d0127afd..f8458a2b49 100644
index eb56940a18..7f999cbd5b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose