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

Fix build

Browse Source 
I totally didn't notice that the patch had a conflict >_>
This commit is contained in:
Aikar
2017-01-02 02:05:02 -05:00
parent eee4d138dd
commit 3734a3acdb
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Custom-replacement-for-eaten-items.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
index bf8fbac4e..21603953c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {