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

Update upstream B/S

Browse Source
This commit is contained in:
Zach Brown
2017-05-23 17:11:28 -05:00
parent b39f2133a1
commit 16113437c6
20 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -624,7 +624,7 @@ index 70fde368f..c56aa5c19 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 ef63b5d3b..0e70cdf6f 100644
index 48fb9662f..c7b8ae636 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;
@@ -1416,7 +1416,7 @@ index b924dad97..63c7d4402 100644
// CraftBukkit start
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index db23104bc..3114a6ecc 100644
index 83a4692af..5c05ae407 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {