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

Update upstream CB/S

Browse Source
This commit is contained in:
Zach Brown
2017-06-11 12:03:07 -05:00
parent 3b5e6cd48f
commit e3dd2d2df2
14 changed files with 33 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/Timings-v2.patch
View File

@@ -607,7 +607,7 @@ index 7fe2796fe..2feeb855b 100644
return waitable.get();
} catch (java.util.concurrent.ExecutionException e) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index da1598a24..2facde681 100644
index e3e9a2136..000a0051f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ import org.bukkit.block.BlockFace;
@@ -1265,7 +1265,7 @@ index d16e499ae..aced20e3b 100644
public boolean b(AxisAlignedBB axisalignedbb) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index bbbbae49b..5835553b5 100644
index 7bed637ab..ce8fe791d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {