From a1b68d938d49e1e00b91371bb13740d2ce01c2ad Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Sat, 4 Jan 2014 13:06:31 -0800 Subject: [PATCH] Deprecate BlockFire.func_149842_a, and throw exception if someone tries to set the burn properties for air. Should prevent 'The Air is on fire!' reports. --- .../net/minecraft/block/Block.java.patch | 2 +- .../net/minecraft/block/BlockFire.java.patch | 32 +++++++++++-------- .../net/minecraft/client/Minecraft.java.patch | 18 +++++------ 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index 5520a72a89..fab5e72feb 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -885,7 +885,7 @@ + * Cacti checks if its a cacti, or if its sand + * Nether types check for soul sand + * Crops check for tilled soil -+ * Caves check if it's a colid surface ++ * Caves check if it's a solid surface + * Plains check if its grass or dirt + * Water check if its still water + * diff --git a/patches/minecraft/net/minecraft/block/BlockFire.java.patch b/patches/minecraft/net/minecraft/block/BlockFire.java.patch index 1b4fbe8b91..40280dc86a 100644 --- a/patches/minecraft/net/minecraft/block/BlockFire.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockFire.java.patch @@ -29,8 +29,11 @@ @SideOnly(Side.CLIENT) private IIcon[] field_149850_M; private static final String __OBFID = "CL_00000245"; -@@ -56,8 +63,7 @@ +@@ -54,10 +61,10 @@ + Blocks.fire.func_149842_a(func_149682_b(Blocks.carpet), 60, 20); + } ++ @Deprecated // Use setFireInfo public void func_149842_a(int p_149842_1_, int p_149842_2_, int p_149842_3_) { - this.field_149849_a[p_149842_1_] = p_149842_2_; @@ -39,7 +42,7 @@ } public AxisAlignedBB func_149668_a(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) -@@ -94,13 +100,8 @@ +@@ -94,13 +101,8 @@ { if (p_149674_1_.getGameRules().getGameRuleBooleanValue("doFireTick")) { @@ -54,7 +57,7 @@ if (!this.func_149742_c(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_)) { p_149674_1_.func_147468_f(p_149674_2_, p_149674_3_, p_149674_4_); -@@ -128,7 +129,7 @@ +@@ -128,7 +130,7 @@ p_149674_1_.func_147468_f(p_149674_2_, p_149674_3_, p_149674_4_); } } @@ -63,7 +66,7 @@ { p_149674_1_.func_147468_f(p_149674_2_, p_149674_3_, p_149674_4_); } -@@ -142,12 +143,12 @@ +@@ -142,12 +144,12 @@ b0 = -50; } @@ -82,7 +85,7 @@ for (int i1 = p_149674_2_ - 1; i1 <= p_149674_2_ + 1; ++i1) { -@@ -201,10 +202,16 @@ +@@ -201,10 +203,16 @@ return false; } @@ -100,7 +103,7 @@ if (p_149841_6_.nextInt(p_149841_5_) < j1) { boolean flag = p_149841_1_.func_147439_a(p_149841_2_, p_149841_3_, p_149841_4_) == Blocks.tnt; -@@ -234,7 +241,12 @@ +@@ -234,7 +242,12 @@ private boolean func_149847_e(World p_149847_1_, int p_149847_2_, int p_149847_3_, int p_149847_4_) { @@ -114,7 +117,7 @@ } private int func_149845_m(World p_149845_1_, int p_149845_2_, int p_149845_3_, int p_149845_4_) -@@ -247,12 +259,13 @@ +@@ -247,12 +260,13 @@ } else { @@ -134,7 +137,7 @@ return l; } } -@@ -262,15 +275,16 @@ +@@ -262,15 +276,16 @@ return false; } @@ -154,7 +157,7 @@ } public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_) -@@ -314,9 +328,9 @@ +@@ -314,9 +329,9 @@ float f1; float f2; @@ -166,7 +169,7 @@ { for (l = 0; l < 2; ++l) { -@@ -327,7 +341,7 @@ +@@ -327,7 +342,7 @@ } } @@ -175,7 +178,7 @@ { for (l = 0; l < 2; ++l) { -@@ -338,7 +352,7 @@ +@@ -338,7 +353,7 @@ } } @@ -184,7 +187,7 @@ { for (l = 0; l < 2; ++l) { -@@ -349,7 +363,7 @@ +@@ -349,7 +364,7 @@ } } @@ -193,7 +196,7 @@ { for (l = 0; l < 2; ++l) { -@@ -360,7 +374,7 @@ +@@ -360,7 +375,7 @@ } } @@ -202,7 +205,7 @@ { for (l = 0; l < 2; ++l) { -@@ -405,4 +419,100 @@ +@@ -405,4 +420,101 @@ { return MapColor.field_151656_f; } @@ -217,6 +220,7 @@ + + public void setFireInfo(Block block, int encouragement, int flammibility) + { ++ if (block == Blocks.air) throw new IllegalArgumentException("Tried to set air on fire... This is bad."); + int id = Block.func_149682_b(block); + this.field_149849_a[id] = encouragement; + this.field_149848_b[id] = flammibility; diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 5f92b6a558..c608761dcf 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -72,7 +72,7 @@ if (p_147108_1_ instanceof GuiMainMenu) { this.gameSettings.showDebugInfo = false; -@@ -1337,7 +1351,7 @@ +@@ -1338,7 +1352,7 @@ if (this.thePlayer.isCurrentToolAdventureModeExempt(i, j, k)) { @@ -81,7 +81,7 @@ this.thePlayer.swingItem(); } } -@@ -1418,11 +1432,12 @@ +@@ -1419,11 +1433,12 @@ int j = this.objectMouseOver.blockY; int k = this.objectMouseOver.blockZ; @@ -96,7 +96,7 @@ { flag = false; this.thePlayer.swingItem(); -@@ -1449,7 +1464,8 @@ +@@ -1450,7 +1465,8 @@ { ItemStack itemstack1 = this.thePlayer.inventory.getCurrentItem(); @@ -106,7 +106,7 @@ { this.entityRenderer.itemRenderer.resetEquippedProgress2(); } -@@ -1651,6 +1667,8 @@ +@@ -1652,6 +1668,8 @@ while (Mouse.next()) { @@ -115,7 +115,7 @@ i = Mouse.getEventButton(); if (isRunningOnMac && i == 0 && (Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157))) -@@ -2120,6 +2138,11 @@ +@@ -2121,6 +2139,11 @@ // JAVADOC METHOD $$ func_71353_a public void loadWorld(WorldClient par1WorldClient, String par2Str) { @@ -127,7 +127,7 @@ if (par1WorldClient == null) { NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); -@@ -2132,6 +2155,18 @@ +@@ -2133,6 +2156,18 @@ if (this.theIntegratedServer != null) { this.theIntegratedServer.initiateShutdown(); @@ -146,7 +146,7 @@ } this.theIntegratedServer = null; -@@ -2287,113 +2322,10 @@ +@@ -2288,113 +2323,10 @@ if (this.objectMouseOver != null) { boolean flag = this.thePlayer.capabilities.isCreativeMode; @@ -262,7 +262,7 @@ if (flag) { j = this.thePlayer.inventoryContainer.inventorySlots.size() - 9 + this.thePlayer.inventory.currentItem; -@@ -2563,9 +2495,16 @@ +@@ -2564,9 +2496,16 @@ par1PlayerUsageSnooper.addData("gl_max_texture_size", Integer.valueOf(getGLMaximumTextureSize())); } @@ -279,7 +279,7 @@ for (int i = 16384; i > 0; i >>= 1) { GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null); -@@ -2573,6 +2512,7 @@ +@@ -2574,6 +2513,7 @@ if (j != 0) {