Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 20:46:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix zombie sieges and their spawn mechanics

Browse Source
This commit is contained in:
Zach Brown 2014-06-24 22:56:20 -05:00
parent 3fce01ba19
commit 46bae13502
1 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
CraftBukkit-Patches/0019-Fix-zombie-sieges-and-their-spawn-mechanics.patch Normal file
View File

@ -0,0 +1,49 @@
From e0d7c57b76f4d4b2ad1d14a316ef77314c8446a6 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
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