Remove "Don't double add golems to world"

Fixed upstream
This commit is contained in:
Shane Freeder
2019-01-17 02:02:56 +00:00
parent bd8cab5d23
commit 0d458bd338
65 changed files with 198 additions and 219 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Witch API
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
index feedfc9d9..955e0e19b 100644
index feedfc9d9c..955e0e19b9 100644
--- a/src/main/java/net/minecraft/server/EntityWitch.java
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
@@ -0,0 +0,0 @@
@@ -94,7 +94,7 @@ index feedfc9d9..955e0e19b 100644
f = super.applyMagicModifier(damagesource, f);
if (damagesource.getEntity() == this) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
index f25998eb6..ac465bda2 100644
index f25998eb6d..ac465bda2e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.CraftServer;