diff options
| author | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
| commit | c5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (patch) | |
| tree | 9f3b1ce732f0082b71512b1dddb7abb35526226e /nms-patches/EntityEnderDragon.patch | |
| parent | 4cb32587ac1ff543b2efa9498f8d0d358cb90c12 (diff) | |
| download | craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.gz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.lz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.xz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.zip | |
Minecraft 1.9.4
Diffstat (limited to 'nms-patches/EntityEnderDragon.patch')
| -rw-r--r-- | nms-patches/EntityEnderDragon.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/nms-patches/EntityEnderDragon.patch b/nms-patches/EntityEnderDragon.patch index 456f569a..2973d62d 100644 --- a/nms-patches/EntityEnderDragon.patch +++ b/nms-patches/EntityEnderDragon.patch @@ -1,7 +1,7 @@ --- a/net/minecraft/server/EntityEnderDragon.java +++ b/net/minecraft/server/EntityEnderDragon.java -@@ -4,7 +4,12 @@ - import java.util.List; +@@ -5,7 +5,12 @@ + import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +// CraftBukkit start @@ -12,25 +12,25 @@ +// PAIL: Fixme public class EntityEnderDragon extends EntityInsentient implements IComplex, IMonster { - private static final Logger bH = LogManager.getLogger(); -@@ -32,6 +37,7 @@ - private final PathPoint[] bM = new PathPoint[24]; - private final int[] bN = new int[24]; - private final Path bO = new Path(); + private static final Logger bI = LogManager.getLogger(); +@@ -33,6 +38,7 @@ + private final PathPoint[] bN = new PathPoint[24]; + private final int[] bO = new int[24]; + private final Path bP = new Path(); + private Explosion explosionSource = new Explosion(null, this, Double.NaN, Double.NaN, Double.NaN, Float.NaN, true, true); // CraftBukkit - reusable source for CraftTNTPrimed.getSource() public EntityEnderDragon(World world) { super(world); -@@ -169,7 +175,7 @@ +@@ -170,7 +176,7 @@ Vec3D vec3d = idragoncontroller.g(); - if (vec3d != null) { -+ if (vec3d != null && idragoncontroller.i() != DragonControllerPhase.k) { // CraftBukkit - Don't move when hovering ++ if (vec3d != null && idragoncontroller.getControllerPhase() != DragonControllerPhase.k) { // CraftBukkit - Don't move when hovering // PAIL: rename d0 = vec3d.x - this.locX; d1 = vec3d.y - this.locY; d2 = vec3d.z - this.locZ; -@@ -308,7 +314,14 @@ +@@ -309,7 +315,14 @@ if (this.currentEnderCrystal.dead) { this.currentEnderCrystal = null; } else if (this.ticksLived % 10 == 0 && this.getHealth() < this.getMaxHealth()) { @@ -46,7 +46,7 @@ } } -@@ -381,6 +394,10 @@ +@@ -382,6 +395,10 @@ int j1 = MathHelper.floor(axisalignedbb.f); boolean flag = false; boolean flag1 = false; @@ -57,7 +57,7 @@ for (int k1 = i; k1 <= l; ++k1) { for (int l1 = j; l1 <= i1; ++l1) { -@@ -394,7 +411,11 @@ +@@ -395,7 +412,11 @@ flag = true; } else if (block != Blocks.BARRIER && block != Blocks.OBSIDIAN && block != Blocks.END_STONE && block != Blocks.BEDROCK && block != Blocks.END_PORTAL && block != Blocks.END_PORTAL_FRAME) { if (block != Blocks.COMMAND_BLOCK && block != Blocks.dc && block != Blocks.dd && block != Blocks.IRON_BARS && block != Blocks.END_GATEWAY) { @@ -70,7 +70,7 @@ } else { flag = true; } -@@ -406,6 +427,41 @@ +@@ -407,6 +428,41 @@ } } |