mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update Upstream

Browse source 
Removed my ChunkLoadEvent patch as upstream fixed it
This commit is contained in:
Aikar 2018-07-30 01:08:59 -04:00
parent 5fe01c2659
commit 720dabd2aa
40 changed files with 60 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch
View file

@ -78,7 +78,7 @@ index 7bd7aa0d94..5d9bed3f19 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 3ac115ff65..ba2aeb432d 100644
index 1997cbdc65..114a13b625 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@
@ -149,7 +149,7 @@ index 3ac115ff65..ba2aeb432d 100644
this.world.a((Collection) entityslice);
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d84a3fe4cc..97b1e5ceac 100644
index 347273b553..69e0cf85c8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke