From c11ad7930f59a63e43c00e534054eb9d55654350 Mon Sep 17 00:00:00 2001 From: Myles Date: Wed, 9 Mar 2016 21:30:43 +0000 Subject: [PATCH] Tiny cleanup allow it to be disabled via config and add lenis0012 to contributors <3 --- README.md | 2 ++ src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java | 3 ++- .../java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java | 5 ----- .../myles/ViaVersion/transformers/IncomingTransformer.java | 5 +++++ src/main/resources/config.yml | 4 +++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a91074ac6..ccaec7ddd 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,8 @@ Contributors: **fillefilip8** +**lenis0012** + Releases / Dev Builds: diff --git a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java index fb9347e01..85578f1a1 100644 --- a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java +++ b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java @@ -73,7 +73,8 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI { getLogger().info("ViaVersion " + getDescription().getVersion() + " is now enabled, injecting. (Allows 1.8 to be accessed via 1.9)"); injectPacketHandler(); - new ViaIdleThread(portedPlayers).runTaskTimerAsynchronously(this, 1L, 1L); // Updates player's idle status + if (getConfig().getBoolean("simulate-pt", true)) + new ViaIdleThread(portedPlayers).runTaskTimerAsynchronously(this, 1L, 1L); // Updates player's idle status if (getConfig().getBoolean("checkforupdates")) UpdateUtil.sendUpdateMessage(this); diff --git a/src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java b/src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java index ef455cd07..d283e39e1 100644 --- a/src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java +++ b/src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java @@ -38,11 +38,6 @@ public class ViaDecodeHandler extends ByteToMessageDecoder { bytebuf.clear(); throw e; } - - // Update idle status (player, position, look, positionandlook) - if(id == 0x0F || id == 0x0E || id == 0x0D || id == 0x0C) { - info.incrementIdlePacket(); - } } // call minecraft decoder list.addAll(PacketUtil.callDecode(this.minecraftDecoder, ctx, bytebuf)); diff --git a/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java b/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java index 5ece3646b..e3b5c5699 100644 --- a/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java +++ b/src/main/java/us/myles/ViaVersion/transformers/IncomingTransformer.java @@ -43,6 +43,11 @@ public class IncomingTransformer { if (packet == PacketType.PLAY_TP_CONFIRM || packet == PacketType.PLAY_VEHICLE_MOVE_REQUEST) { //TODO handle client-sided horse riding throw new CancelException(); } + // Handle movement increment + // Update idle status (player, position, look, positionandlook) + if(packet == PacketType.PLAY_PLAYER || packet == PacketType.PLAY_PLAYER_POSITION_REQUEST || packet == PacketType.PLAY_PLAYER_LOOK_REQUEST || packet == PacketType.PLAY_PLAYER_POSITION_LOOK_REQUEST) { + info.incrementIdlePacket(); + } PacketUtil.writeVarInt(packetID, output); if (packet == PacketType.HANDSHAKE) { int protVer = PacketUtil.readVarInt(input); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 0478e117a..dab6e0d51 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -16,4 +16,6 @@ shield-blocking: true # If they're in the wrong place enable this hologram-patch: false # This is the offset, should work as default when enabled. -hologram-y: -1 \ No newline at end of file +hologram-y: -1 +# Enable player tick simulation, this fixes eating, drinking, nether portals. +simulate-pt: true \ No newline at end of file