Update upstream

2018-04-22 10:40:36 -04:00
parent bfd81cc275
commit 46d4568f31
17 changed files with 17 additions and 67 deletions
--- a/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
@@ -31,7 +31,7 @@ index 60149c1ca..a5730d1c7 100644
             IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 66e56e0fd..942f57df1 100644
+index ea6f46522..01dba285a 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 IBlockAccess {