From 176b75b97edaaea8551123664ebc4c9975e05225 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 23 Jul 2018 11:12:20 +1000 Subject: [PATCH] #2477: Fix entity rewrites not applying --- .../java/net/md_5/bungee/connection/DownstreamBridge.java | 2 +- .../java/net/md_5/bungee/connection/UpstreamBridge.java | 2 +- .../src/main/java/net/md_5/bungee/entitymap/EntityMap.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java index 8f6f5c0f..22a5ac05 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java @@ -101,7 +101,7 @@ public class DownstreamBridge extends PacketHandler @Override public void handle(PacketWrapper packet) throws Exception { - con.getEntityRewrite().rewriteClientbound( packet.buf, con.getServerEntityId(), con.getClientEntityId() ); + con.getEntityRewrite().rewriteClientbound( packet.buf, con.getServerEntityId(), con.getClientEntityId(), con.getPendingConnection().getVersion() ); con.sendPacket( packet ); } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java index 99933dc8..9666e7a2 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java @@ -109,7 +109,7 @@ public class UpstreamBridge extends PacketHandler { if ( con.getServer() != null ) { - con.getEntityRewrite().rewriteServerbound( packet.buf, con.getClientEntityId(), con.getServerEntityId() ); + con.getEntityRewrite().rewriteServerbound( packet.buf, con.getClientEntityId(), con.getServerEntityId(), con.getPendingConnection().getVersion() ); con.getServer().getCh().write( packet ); } } diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java index cae566f5..049aa2e8 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java @@ -145,7 +145,7 @@ public abstract class EntityMap DefinedPacket.readString( packet ); } break; - case 14: // particle + case 15: // particle int particleId = DefinedPacket.readVarInt( packet ); switch ( particleId ) { @@ -162,7 +162,10 @@ public abstract class EntityMap } break; default: - type--; + if ( type >= 6 ) + { + type--; + } break; } }