From 46bae135021ed86e7ceda89bba1d3431425e3e38 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 24 Jun 2014 22:56:20 -0500 Subject: [PATCH] Fix zombie sieges and their spawn mechanics --- ...bie-sieges-and-their-spawn-mechanics.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 CraftBukkit-Patches/0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch diff --git a/CraftBukkit-Patches/0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch b/CraftBukkit-Patches/0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch new file mode 100644 index 0000000000..577a2dc7b6 --- /dev/null +++ b/CraftBukkit-Patches/0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch @@ -0,0 +1,49 @@ +From e0d7c57b76f4d4b2ad1d14a316ef77314c8446a6 Mon Sep 17 00:00:00 2001 +From: Zach Brown +Date: Tue, 24 Jun 2014 22:55:30 -0500 +Subject: [PATCH] Fix zombie sieges and their spawn mechanics + + +diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java +index fc83932..ddef6e6 100644 +--- a/src/main/java/net/minecraft/server/VillageSiege.java ++++ b/src/main/java/net/minecraft/server/VillageSiege.java +@@ -50,6 +50,12 @@ public class VillageSiege { + return; + } + } ++ ++ // PaperSpigot start - Siege manager initial state is -1 ++ if (this.c == -1) { ++ return; ++ } ++ // PaperSpigot end + } + + if (!this.b) { +@@ -89,9 +95,12 @@ public class VillageSiege { + + while (true) { + if (i < 10) { +- this.g = chunkcoordinates.x + (int) ((double) (MathHelper.cos(this.world.random.nextFloat() * 3.1415927F * 2.0F) * f) * 0.9D); ++ // PaperSpigot start - Zombies should spawn near the perimeter of the village not in the center of it ++ float angle = this.world.random.nextFloat() * (float) Math.PI * 2.0F; ++ this.g = chunkcoordinates.x + (int) ((double) (MathHelper.cos(angle) * f) * 0.9D); + this.h = chunkcoordinates.y; +- this.i = chunkcoordinates.z + (int) ((double) (MathHelper.sin(this.world.random.nextFloat() * 3.1415927F * 2.0F) * f) * 0.9D); ++ this.i = chunkcoordinates.z + (int) ((double) (MathHelper.sin(angle) * f) * 0.9D); ++ // PaperSpigot end + flag = false; + Iterator iterator1 = this.world.villages.getVillages().iterator(); + +@@ -165,6 +174,7 @@ public class VillageSiege { + // CraftBukkit - add Return + return Vec3D.a((double) i1, (double) j1, (double) k1); + } ++ + } + + return null; +-- +1.9.1 +