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

Update upstream

Browse Source
This commit is contained in:
Aikar
2018-04-22 10:40:36 -04:00
parent bfd81cc275
commit 46d4568f31
17 changed files with 17 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/Add-EntityZapEvent.patch
View File

@@ -22,7 +22,7 @@ index 94d011721..fcf99e668 100644
if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
return;
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index fd3714e8e..cfc8d986f 100644
index 87ed31b21..9d201b14e 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {