diff --git a/patches/server/Add-EntityZapEvent.patch b/patches/server/Add-EntityZapEvent.patch
index 60321bff47..d471a04c35 100644
--- a/patches/server/Add-EntityZapEvent.patch
+++ b/patches/server/Add-EntityZapEvent.patch
@@ -4,22 +4,6 @@ Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-@@ -0,0 +0,0 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
-             }
- 
-             entitypigzombie.setPersistenceRequired();
-+            // Paper start
-+            if (CraftEventFactory.callEntityZapEvent(this, lightning, entitypigzombie).isCancelled()) {
-+                return;
-+            }
-+            // Paper end
-             // CraftBukkit start
-             if (CraftEventFactory.callPigZapEvent(this, lightning, entitypigzombie).isCancelled()) {
-                 return;
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java