SteamWar/Paper
10
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-18 20:36:55 -05:00
parent 43e2c9c48c
commit 1c208bf05b
147 changed files with 327 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/Shoulder-Entities-Release-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index f5e25e63d..c74095554 100644
index f5e25e63..c7409555 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -62,7 +62,7 @@ index f5e25e63d..c74095554 100644
public abstract boolean isSpectator();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 25e1e5a3f..463dddc98 100644
index 25e1e5a3..463dddc9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -0,0 +0,0 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {