From 02e857827d05fb8765e664d206e6a1633f34c093 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 3 Jul 2013 06:26:12 -0700 Subject: [PATCH] TEMPORARY fix for MCP mapping issue. --- .../entity/boss/BossStatus.java.patch | 11 ++++ .../entity/boss/EntityDragon.java.patch | 57 +++++++++++++++++++ .../entity/boss/EntityWither.java.patch | 46 +++++++++++++++ .../entity/boss/IBossDisplayData.java.patch | 14 +++++ 4 files changed, 128 insertions(+) create mode 100644 patches/minecraft/net/minecraft/entity/boss/BossStatus.java.patch create mode 100644 patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch create mode 100644 patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch diff --git a/patches/minecraft/net/minecraft/entity/boss/BossStatus.java.patch b/patches/minecraft/net/minecraft/entity/boss/BossStatus.java.patch new file mode 100644 index 0000000000..8968cf85e1 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/boss/BossStatus.java.patch @@ -0,0 +1,11 @@ +--- ../src_base/minecraft/net/minecraft/entity/boss/BossStatus.java ++++ ../src_work/minecraft/net/minecraft/entity/boss/BossStatus.java +@@ -13,7 +13,7 @@ + + public static void func_82824_a(IBossDisplayData par0IBossDisplayData, boolean par1) + { +- healthScale = par0IBossDisplayData.func_110183_aJ() / par0IBossDisplayData.getMaxHealth(); ++ healthScale = par0IBossDisplayData.func_110143_aJ() / par0IBossDisplayData.func_110138_aP(); + statusBarLength = 100; + bossName = par0IBossDisplayData.getEntityName(); + field_82825_d = par1; diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch index f8170bdad7..c04f282ea0 100644 --- a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch +++ b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch @@ -1,5 +1,45 @@ --- ../src_base/minecraft/net/minecraft/entity/boss/EntityDragon.java +++ ../src_work/minecraft/net/minecraft/entity/boss/EntityDragon.java +@@ -75,7 +75,7 @@ + { + super(par1World); + this.dragonPartArray = new EntityDragonPart[] {this.dragonPartHead = new EntityDragonPart(this, "head", 6.0F, 6.0F), this.dragonPartBody = new EntityDragonPart(this, "body", 8.0F, 8.0F), this.dragonPartTail1 = new EntityDragonPart(this, "tail", 4.0F, 4.0F), this.dragonPartTail2 = new EntityDragonPart(this, "tail", 4.0F, 4.0F), this.dragonPartTail3 = new EntityDragonPart(this, "tail", 4.0F, 4.0F), this.dragonPartWing1 = new EntityDragonPart(this, "wing", 4.0F, 4.0F), this.dragonPartWing2 = new EntityDragonPart(this, "wing", 4.0F, 4.0F)}; +- this.setEntityHealth(this.getMaxHealth()); ++ this.setEntityHealth(this.func_110138_aP()); + this.setSize(16.0F, 8.0F); + this.noClip = true; + this.isImmuneToFire = true; +@@ -100,7 +100,7 @@ + */ + public double[] getMovementOffsets(int par1, float par2) + { +- if (this.func_110183_aJ() <= 0.0F) ++ if (this.func_110143_aJ() <= 0.0F) + { + par2 = 0.0F; + } +@@ -142,7 +142,7 @@ + this.prevAnimTime = this.animTime; + float f2; + +- if (this.func_110183_aJ() <= 0.0F) ++ if (this.func_110143_aJ() <= 0.0F) + { + f = (this.rand.nextFloat() - 0.5F) * 8.0F; + f1 = (this.rand.nextFloat() - 0.5F) * 4.0F; +@@ -396,9 +396,9 @@ + + this.healingEnderCrystal = null; + } +- else if (this.ticksExisted % 10 == 0 && this.func_110183_aJ() < this.getMaxHealth()) +- { +- this.setEntityHealth(this.func_110183_aJ() + 1.0F); ++ else if (this.ticksExisted % 10 == 0 && this.func_110143_aJ() < this.func_110138_aP()) ++ { ++ this.setEntityHealth(this.func_110143_aJ() + 1.0F); + } + } + @@ -527,10 +527,11 @@ for (int i2 = k; i2 <= j1; ++i2) { @@ -15,3 +55,20 @@ { flag1 = this.worldObj.setBlockToAir(k1, l1, i2) || flag1; } +@@ -753,16 +754,4 @@ + { + return 5.0F; + } +- +- @Override +- public float getMaxHealth() +- { +- return 0.0f; +- } +- +- @Override +- public float func_110183_aJ() +- { +- return 0.0f; +- } + } diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch b/patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch new file mode 100644 index 0000000000..650de20a55 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch @@ -0,0 +1,46 @@ +--- ../src_base/minecraft/net/minecraft/entity/boss/EntityWither.java ++++ ../src_work/minecraft/net/minecraft/entity/boss/EntityWither.java +@@ -45,7 +45,7 @@ + public EntityWither(World par1World) + { + super(par1World); +- this.setEntityHealth(this.getMaxHealth()); ++ this.setEntityHealth(this.func_110138_aP()); + this.setSize(0.9F, 4.0F); + this.isImmuneToFire = true; + this.getNavigator().setCanSwim(true); +@@ -380,7 +380,7 @@ + public void func_82206_m() + { + this.func_82215_s(220); +- this.setEntityHealth(this.getMaxHealth() / 3.0F); ++ this.setEntityHealth(this.func_110138_aP() / 3.0F); + } + + /** +@@ -633,7 +633,7 @@ + */ + public boolean isArmored() + { +- return this.func_110183_aJ() <= this.getMaxHealth() / 2.0F; ++ return this.func_110143_aJ() <= this.func_110138_aP() / 2.0F; + } + + /** +@@ -651,16 +651,4 @@ + { + this.ridingEntity = null; + } +- +- @Override +- public float getMaxHealth() +- { +- return 0.0f; +- } +- +- @Override +- public float func_110183_aJ() +- { +- return 0.0f; +- } + } diff --git a/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch b/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch new file mode 100644 index 0000000000..84b1f677eb --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch @@ -0,0 +1,14 @@ +--- ../src_base/minecraft/net/minecraft/entity/boss/IBossDisplayData.java ++++ ../src_work/minecraft/net/minecraft/entity/boss/IBossDisplayData.java +@@ -2,9 +2,9 @@ + + public interface IBossDisplayData + { +- float getMaxHealth(); ++ float func_110138_aP(); + +- float func_110183_aJ(); ++ float func_110143_aJ(); + + /** + * Gets the username of the entity.