From 35aba603f49941fd3924fdb53f2d6c248491f2a6 Mon Sep 17 00:00:00 2001 From: Robotia Date: Sat, 6 Feb 2016 21:57:57 -0500 Subject: [PATCH] Fix ThermosCommand + 'Horrible Code Hack' --- .../minecraftforge/event/ForgeEventFactory.java.patch | 11 +++++------ src/main/java/thermos/ThermosCommand.java | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/patches/net/minecraftforge/event/ForgeEventFactory.java.patch b/patches/net/minecraftforge/event/ForgeEventFactory.java.patch index 8ca21041..de2547a5 100644 --- a/patches/net/minecraftforge/event/ForgeEventFactory.java.patch +++ b/patches/net/minecraftforge/event/ForgeEventFactory.java.patch @@ -35,7 +35,7 @@ PlayerEvent.HarvestCheck event = new PlayerEvent.HarvestCheck(player, block, success); MinecraftForge.EVENT_BUS.post(event); return event.success; -@@ -80,25 +94,140 @@ +@@ -80,25 +94,139 @@ @Deprecated // Location version below public static float getBreakSpeed(EntityPlayer player, Block block, int metadata, float original) { @@ -127,11 +127,10 @@ + aktor = org.bukkit.event.block.Action.LEFT_CLICK_AIR; + break; + } -+ if(!(x==0 && y==0 && z == 0 && face==-1)) { ++ if((x==0 && y==0 && z == 0 && face==-1)) { y = 256; face = 0;} // 0, 256, 0, 0, + org.bukkit.event.player.PlayerInteractEvent eve = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(player, aktor, x, y, z, face, player.getHeldItem()); + event.cb = eve; + if(eve.isCancelled()) { event.setCanceled(true); return event; } -+ } + if (isSpawn(player) && nonVanilla(player)) + { + event.setCanceled(true); @@ -163,11 +162,11 @@ + aktor = org.bukkit.event.block.Action.LEFT_CLICK_AIR; + break; + } -+ if(!(x==0 && y==0 && z == 0 && face==-1)) { ++ if((x==0 && y==0 && z == 0 && face==-1)) { y = 256; face = 0;} // 0, 256, 0, 0, + org.bukkit.event.player.PlayerInteractEvent eve = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(player, aktor, x, y, z, face, player.getHeldItem()); + event.cb = eve; + if(eve.isCancelled()) { event.setCanceled(true); return event; } -+ } ++ + if (isSpawn(player) && nonVanilla(player)) + { + event.setCanceled(true); @@ -180,7 +179,7 @@ } public static void onPlayerDestroyItem(EntityPlayer player, ItemStack stack) -@@ -182,30 +311,64 @@ +@@ -182,30 +310,64 @@ return MinecraftForge.EVENT_BUS.post(new EntityStruckByLightningEvent(entity, bolt)); } diff --git a/src/main/java/thermos/ThermosCommand.java b/src/main/java/thermos/ThermosCommand.java index d9b9b7ce..04851fc4 100644 --- a/src/main/java/thermos/ThermosCommand.java +++ b/src/main/java/thermos/ThermosCommand.java @@ -36,7 +36,7 @@ public ThermosCommand() { super(NAME); StringBuilder builder = new StringBuilder(); - builder.append(String.format("-------------------[" + ChatColor.RED + "Thermos" + ChatColor.RESET + "]-------------------")) + builder.append(String.format("-------------------[" + ChatColor.RED + "Thermos" + ChatColor.RESET + "]-------------------")); builder.append(String.format("/%s check - Check for an update.\n", NAME)); builder.append(String.format("/%s tps - Show tps statistics.\n", NAME)); builder.append(String.format("/%s restart - Restart the server.\n", NAME));