From 36b2306584b94ffab5bc986f841c7531d830a187 Mon Sep 17 00:00:00 2001 From: Chicken-Bones Date: Mon, 30 Dec 2013 13:52:35 +1000 Subject: [PATCH] Safeguarded redstone torch ticking. --- codechicken/multipart/minecraft/ButtonPart.java | 4 ++-- codechicken/multipart/minecraft/RedstoneTorchPart.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codechicken/multipart/minecraft/ButtonPart.java b/codechicken/multipart/minecraft/ButtonPart.java index e0124f9..b08cb65 100644 --- a/codechicken/multipart/minecraft/ButtonPart.java +++ b/codechicken/multipart/minecraft/ButtonPart.java @@ -131,7 +131,7 @@ public class ButtonPart extends McSidedMetaPart implements IFaceRedstonePart meta^=8; world().playSoundEffect(x() + 0.5, y() + 0.5, z() + 0.5, "random.click", 0.3F, in ? 0.6F : 0.5F); if(in) - TickScheduler.scheduleTick(this, delay()); + scheduleTick(delay()); sendDescUpdate(); tile().notifyPartChange(this); @@ -148,7 +148,7 @@ public class ButtonPart extends McSidedMetaPart implements IFaceRedstonePart if(arrows != pressed) toggle(); if(arrows && pressed) - TickScheduler.scheduleTick(this, delay()); + scheduleTick(delay()); } @Override diff --git a/codechicken/multipart/minecraft/RedstoneTorchPart.java b/codechicken/multipart/minecraft/RedstoneTorchPart.java index 03389cf..b33100b 100644 --- a/codechicken/multipart/minecraft/RedstoneTorchPart.java +++ b/codechicken/multipart/minecraft/RedstoneTorchPart.java @@ -132,7 +132,7 @@ public class RedstoneTorchPart extends TorchPart implements IFaceRedstonePart, I @Override public void scheduledTick() { - if(isBeingPowered() == active()) + if(!world().isRemote && isBeingPowered() == active()) toggle(); }