diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index 778897912..243a41077 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -98,15 +98,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 Bukkit Team Bukkit ${api.version} -@@ -0,0 +0,0 @@ - - org.apache.maven.plugins - maven-shade-plugin -- 1.4 -+ 2.1 - - - package diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/CraftBukkit-Patches/0002-mc-dev-imports.patch b/CraftBukkit-Patches/0002-mc-dev-imports.patch index a28f916b8..0447b61cf 100644 --- a/CraftBukkit-Patches/0002-mc-dev-imports.patch +++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch @@ -5432,16 +5432,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + throw (T) t; + } +} -diff --git a/src/main/resources/org/spigotmc/SneakyThrow.class b/src/main/resources/org/spigotmc/SneakyThrow.class -new file mode 100644 -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 -GIT binary patch -literal 184 -zcmX^0Z`VEsW(HjbE=C64;Jnnt?8=agqWp5bEOrKVMh1bb#Ii*FoW#6zegCAa)Z`LI -z2Cm@z(xT*4x6GVWMg|t={1hN1q2Ys22-csNl#^<$83vTfFG|-hF33#JFUd{TN3wyD -ufvp&9A3M-~MFu7YP6iNQ1kxM~Y(Sb7$m0Xjj6j-6Yd=U5$YufY7#IQ5^(s;T - -literal 0 -HcmV?d00001 - -- \ No newline at end of file diff --git a/CraftBukkit-Patches/0015-Entity-Activation-Range.patch b/CraftBukkit-Patches/0015-Entity-Activation-Range.patch index 7594c8171..9476aeb49 100644 --- a/CraftBukkit-Patches/0015-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0015-Entity-Activation-Range.patch @@ -115,7 +115,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + { + if ( this.inGround ) + { -+ this.ap += 19; // Despawn counter. First int after shooter ++ this.ap += 1; // Despawn counter. First int after shooter + } + super.inactiveTick(); + } diff --git a/CraftBukkit-Patches/0127-Better-item-validation.patch b/CraftBukkit-Patches/0127-Better-item-validation.patch index 1ef600339..0b9bd172a 100644 --- a/CraftBukkit-Patches/0127-Better-item-validation.patch +++ b/CraftBukkit-Patches/0127-Better-item-validation.patch @@ -67,7 +67,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -@@ -0,0 +0,0 @@ import net.minecraft.server.ChatSerializer; +@@ -0,0 +0,0 @@ import net.minecraft.server.IChatBaseComponent; import net.minecraft.server.NBTTagString; import org.bukkit.craftbukkit.util.CraftChatMessage; @@ -96,11 +96,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // Ignore and treat as an old book } } -- pageArray[i] = page; -+ pageArray[i] = limit( page, 2048 ); // Spigot +- addPage(page); ++ addPage( limit( page, 2048 ) ); // Spigot } - - addPage(pageArray); + } + } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java diff --git a/CraftBukkit-Patches/0159-Disable-Explosion-avoiding-for-all-mobs.patch b/CraftBukkit-Patches/0159-Disable-Explosion-avoiding-for-all-mobs.patch new file mode 100644 index 000000000..0e9829b9c --- /dev/null +++ b/CraftBukkit-Patches/0159-Disable-Explosion-avoiding-for-all-mobs.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Thinkofdeath +Date: Sat, 27 Dec 2014 21:08:51 +0000 +Subject: [PATCH] Disable Explosion avoiding for all mobs + +Its going in 1.8.1 anyway + +diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/server/EntityMonster.java ++++ b/src/main/java/net/minecraft/server/EntityMonster.java +@@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityCombustByEntityEvent; // CraftBukkit + + public abstract class EntityMonster extends EntityCreature implements IMonster { + +- protected final PathfinderGoal a = new PathfinderGoalAvoidTarget(this, new EntitySelectorExplodingCreeper(this), 4.0F, 1.0D, 2.0D); ++ protected final PathfinderGoal a = null; // Spigot : new PathfinderGoalAvoidTarget(this, new EntitySelectorExplodingCreeper(this), 4.0F, 1.0D, 2.0D); + + public EntityMonster(World world) { + super(world); +diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java ++++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +@@ -0,0 +0,0 @@ public class PathfinderGoalSelector { + } + + public void a(int i, PathfinderGoal pathfindergoal) { ++ if (pathfindergoal == null) return; // Spigot + this.b.add(new PathfinderGoalSelectorItem(this, i, pathfindergoal)); + } + +-- \ No newline at end of file