Skip to content

Commit

Permalink
Meters are now cleared before joining a server. Fixes bug when moving…
Browse files Browse the repository at this point in the history
… from RSMM server to non-RSMM server
  • Loading branch information
NarcolepticFrog committed Mar 4, 2018
1 parent dcca7ac commit a88d1ff
Showing 1 changed file with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
import net.minecraft.client.renderer.RenderGlobal;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.command.ServerCommandManager;
import net.minecraft.network.INetHandler;
import net.minecraft.network.PacketBuffer;
import net.minecraft.network.play.server.SPacketJoinGame;
import net.minecraft.util.math.RayTraceResult;
import org.lwjgl.input.Keyboard;

Expand All @@ -22,7 +24,7 @@
import java.util.List;

public class LiteModRedstoneMultimeter implements Tickable, HUDRenderListener, PostRenderListener, PreRenderListener,
ServerCommandProvider, PluginChannelListener, RSMMCPacketHandler {
ServerCommandProvider, PluginChannelListener, RSMMCPacketHandler, PreJoinGameListener {

private static KeyBinding toggleMeterKey = new KeyBinding("key.redstonemultimeter.toggle", Keyboard.KEY_M, "key.categories.redstonemultimeter");
private static KeyBinding pauseMetersKey = new KeyBinding("key.redstonemultimeter.pause", Keyboard.KEY_N, "key.categories.redstonemultimeter");
Expand Down Expand Up @@ -110,6 +112,12 @@ public void provideCommands(ServerCommandManager commandManager) {
commandManager.registerCommand(new MeterCommand(rsmmServer));
}

@Override
public boolean onPreJoinGame(INetHandler netHandler, SPacketJoinGame joinGamePacket) {
meters.clear();
return true;
}

@Override
public void handleMeter(RSMMCPacketMeter packet) {
if (packet.shouldCreate()) {
Expand Down Expand Up @@ -178,5 +186,4 @@ public void onRenderClouds(float partialTicks, int pass, RenderGlobal renderGlob
@Override
public void onRenderTerrain(float partialTicks, int pass) { }


}

0 comments on commit a88d1ff

Please sign in to comment.