From 1c8806604fc399005b5b4de458969c82f4036cdc Mon Sep 17 00:00:00 2001 From: Prototik Date: Sat, 25 Jul 2015 06:07:40 +0700 Subject: [PATCH] Update to forge 1492 --- forge | 2 +- .../handshake/FMLHandshakeServerState.java.patch | 4 ++-- patches/net/minecraft/block/BlockFire.java.patch | 14 +++++++------- src/main/resources/fmlversion.properties | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/forge b/forge index 204cb16..c308a47 160000 --- a/forge +++ b/forge @@ -1 +1 @@ -Subproject commit 204cb16bc45e7f60a87aac2cdaa49816bb0e7d12 +Subproject commit c308a47124394f025bc2ba553646ecf8b6c31ba2 diff --git a/patches/cpw/mods/fml/common/network/handshake/FMLHandshakeServerState.java.patch b/patches/cpw/mods/fml/common/network/handshake/FMLHandshakeServerState.java.patch index 8a050e9..ac07249 100644 --- a/patches/cpw/mods/fml/common/network/handshake/FMLHandshakeServerState.java.patch +++ b/patches/cpw/mods/fml/common/network/handshake/FMLHandshakeServerState.java.patch @@ -6,9 +6,9 @@ FMLHandshakeMessage.ModList client = (FMLHandshakeMessage.ModList)msg; - FMLLog.info("Client attempting to join with %d mods : %s", client.modListSize(), client.modListAsString()); + if (net.minecraft.server.MinecraftServer.kcauldronConfig.loggingClientModList.getValue()) { -+ FMLLog.info("Client attempting to join with %d mods : %s", client.modListSize(), client.modListAsString()); ++ FMLLog.info("Client attempting to join with %d mods : %s", client.modListSize(), client.modListAsString()); + } else { -+ FMLLog.info("Client attempting to join with %d mods", client.modListSize()); ++ FMLLog.info("Client attempting to join with %d mods", client.modListSize()); + } String result = FMLNetworkHandler.checkModList(client, Side.CLIENT); if (result != null) diff --git a/patches/net/minecraft/block/BlockFire.java.patch b/patches/net/minecraft/block/BlockFire.java.patch index 04930ff..8293387 100644 --- a/patches/net/minecraft/block/BlockFire.java.patch +++ b/patches/net/minecraft/block/BlockFire.java.patch @@ -17,13 +17,13 @@ if (!this.canPlaceBlockAt(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_)) { - p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); -+ if (!CraftEventFactory.callBlockFadeEvent(p_149674_1_.getWorld().getBlockAt(p_149674_2_, p_149674_3_, p_149674_4_), Blocks.air).isCancelled()) { p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); } // CraftBukkit - invalid place location ++ if (!CraftEventFactory.callBlockFadeEvent(p_149674_1_.getWorld().getBlockAt(p_149674_2_, p_149674_3_, p_149674_4_), Blocks.air).isCancelled()) { p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); } // CraftBukkit - invalid place location } if (!flag && p_149674_1_.isRaining() && (p_149674_1_.canLightningStrikeAt(p_149674_2_, p_149674_3_, p_149674_4_) || p_149674_1_.canLightningStrikeAt(p_149674_2_ - 1, p_149674_3_, p_149674_4_) || p_149674_1_.canLightningStrikeAt(p_149674_2_ + 1, p_149674_3_, p_149674_4_) || p_149674_1_.canLightningStrikeAt(p_149674_2_, p_149674_3_, p_149674_4_ - 1) || p_149674_1_.canLightningStrikeAt(p_149674_2_, p_149674_3_, p_149674_4_ + 1))) { - p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); -+ if (!CraftEventFactory.callBlockFadeEvent(p_149674_1_.getWorld().getBlockAt(p_149674_2_, p_149674_3_, p_149674_4_), Blocks.air).isCancelled()) { p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); } // CraftBukkit - extinguished by rain ++ if (!CraftEventFactory.callBlockFadeEvent(p_149674_1_.getWorld().getBlockAt(p_149674_2_, p_149674_3_, p_149674_4_), Blocks.air).isCancelled()) { p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); } // CraftBukkit - extinguished by rain } else { @@ -32,13 +32,13 @@ if (!World.doesBlockHaveSolidTopSurface(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_) || l > 3) { - p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); -+ if (!CraftEventFactory.callBlockFadeEvent(p_149674_1_.getWorld().getBlockAt(p_149674_2_, p_149674_3_, p_149674_4_), Blocks.air).isCancelled()) { p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); } // CraftBukkit - burn out of inflammable block ++ if (!CraftEventFactory.callBlockFadeEvent(p_149674_1_.getWorld().getBlockAt(p_149674_2_, p_149674_3_, p_149674_4_), Blocks.air).isCancelled()) { p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); } // CraftBukkit - burn out of inflammable block } } else if (!flag && !this.canCatchFire(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_, UP) && l == 15 && p_149674_5_.nextInt(4) == 0) { - p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); -+ if (!CraftEventFactory.callBlockFadeEvent(p_149674_1_.getWorld().getBlockAt(p_149674_2_, p_149674_3_, p_149674_4_), Blocks.air).isCancelled()) { p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); } // CraftBukkit - burn out ++ if (!CraftEventFactory.callBlockFadeEvent(p_149674_1_.getWorld().getBlockAt(p_149674_2_, p_149674_3_, p_149674_4_), Blocks.air).isCancelled()) { p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); } // CraftBukkit - burn out } else { @@ -65,7 +65,7 @@ + + if (!spreadEvent.isCancelled()) + { -+ p_149674_1_.setBlock(i1, k1, j1, ((org.bukkit.craftbukkit.block.CraftBlock)blockState.getBlock()).getNMSBlock(), blockState.getRawData(), 3); // KCauldron - DragonAPI uses this call ++ p_149674_1_.setBlock(i1, k1, j1, ((org.bukkit.craftbukkit.block.CraftBlock)blockState.getBlock()).getNMSBlock(), blockState.getRawData(), 3); // KCauldron - DragonAPI uses this call + blockState.update(true); + } + } @@ -98,7 +98,7 @@ if (!World.doesBlockHaveSolidTopSurface(p_149695_1_, p_149695_2_, p_149695_3_ - 1, p_149695_4_) && !this.canNeighborBurn(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_)) { - p_149695_1_.setBlockToAir(p_149695_2_, p_149695_3_, p_149695_4_); -+ if (!CraftEventFactory.callBlockFadeEvent(p_149695_1_.getWorld().getBlockAt(p_149695_2_, p_149695_3_, p_149695_4_), Blocks.air).isCancelled()) { p_149695_1_.setBlockToAir(p_149695_2_, p_149695_3_, p_149695_4_); } // CraftBukkit - fuel block gone ++ if (!CraftEventFactory.callBlockFadeEvent(p_149695_1_.getWorld().getBlockAt(p_149695_2_, p_149695_3_, p_149695_4_), Blocks.air).isCancelled()) { p_149695_1_.setBlockToAir(p_149695_2_, p_149695_3_, p_149695_4_); } // CraftBukkit - fuel block gone } } @@ -110,7 +110,7 @@ if (!World.doesBlockHaveSolidTopSurface(p_149726_1_, p_149726_2_, p_149726_3_ - 1, p_149726_4_) && !this.canNeighborBurn(p_149726_1_, p_149726_2_, p_149726_3_, p_149726_4_)) { - p_149726_1_.setBlockToAir(p_149726_2_, p_149726_3_, p_149726_4_); -+ if (!CraftEventFactory.callBlockFadeEvent(p_149726_1_.getWorld().getBlockAt(p_149726_2_, p_149726_3_, p_149726_4_), Blocks.air).isCancelled()) { p_149726_1_.setBlockToAir(p_149726_2_, p_149726_3_, p_149726_4_); } // CraftBukkit - fuel block broke ++ if (!CraftEventFactory.callBlockFadeEvent(p_149726_1_.getWorld().getBlockAt(p_149726_2_, p_149726_3_, p_149726_4_), Blocks.air).isCancelled()) { p_149726_1_.setBlockToAir(p_149726_2_, p_149726_3_, p_149726_4_); } // CraftBukkit - fuel block broke } else { diff --git a/src/main/resources/fmlversion.properties b/src/main/resources/fmlversion.properties index 971d767..955ccc5 100644 --- a/src/main/resources/fmlversion.properties +++ b/src/main/resources/fmlversion.properties @@ -1,6 +1,6 @@ fmlbuild.major.number=7 fmlbuild.minor.number=99 fmlbuild.revision.number=4 -fmlbuild.build.number=1481 +fmlbuild.build.number=1492 fmlbuild.mcversion=1.7.10 fmlbuild.mcpversion=9.05