Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-15 23:06:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix server transfers across dimensions (Fixes #378)

Browse Source 
This commit fixes an issue with transferring across server dimensions
with entity metadata rewriting disabled
This commit is contained in:
antbig 2019-06-27 14:42:56 +01:00 committed by Shane Freeder
parent 0ccdb4688f
commit 18b9500429
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From 7819491c31d95725158715348f133888f9520397 Mon Sep 17 00:00:00 2001 From 64a2d5a0ea5d0b807b060e9efcd678d3298afab4 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 14 Jan 2019 03:35:21 +0000 Date: Mon, 14 Jan 2019 03:35:21 +0000
Subject: [PATCH] Provide an option to disable entity metadata rewriting Subject: [PATCH] Provide an option to disable entity metadata rewriting
@ -57,7 +57,7 @@ index f28f0111..41a71f65 100644
+ } + }
} }
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index c2b1de82..1375d1e2 100644 index c2b1de82..72f487dc 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -226,7 +226,7 @@ public class ServerConnector extends PacketHandler @@ -226,7 +226,7 @@ public class ServerConnector extends PacketHandler
@ -85,7 +85,7 @@ index c2b1de82..1375d1e2 100644
serverScoreboard.clear(); serverScoreboard.clear();
for ( UUID bossbar : user.getSentBossBars() ) for ( UUID bossbar : user.getSentBossBars() )
@@ -285,12 +287,27 @@ public class ServerConnector extends PacketHandler @@ -285,12 +287,32 @@ public class ServerConnector extends PacketHandler
user.unsafe().sendPacket( new EntityStatus( user.getClientEntityId(), login.isReducedDebugInfo() ? EntityStatus.DEBUG_INFO_REDUCED : EntityStatus.DEBUG_INFO_NORMAL ) ); user.unsafe().sendPacket( new EntityStatus( user.getClientEntityId(), login.isReducedDebugInfo() ? EntityStatus.DEBUG_INFO_REDUCED : EntityStatus.DEBUG_INFO_NORMAL ) );
user.setDimensionChange( true ); user.setDimensionChange( true );
@ -101,6 +101,11 @@ index c2b1de82..1375d1e2 100644
+ // Ensure that we maintain consistency + // Ensure that we maintain consistency
+ user.setClientEntityId( login.getEntityId() ); + user.setClientEntityId( login.getEntityId() );
+ +
+ // Only send if we are not in the same dimension
+ if (user.getDimension() != login.getDimension()) {
+ user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getDifficulty(), login.getGameMode(), login.getLevelType()));
+ }
+
+ Login modLogin = new Login( login.getEntityId(),login.getGameMode(), login.getDimension(), + Login modLogin = new Login( login.getEntityId(),login.getGameMode(), login.getDimension(),
+ login.getDifficulty(), login.getMaxPlayers(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo() ); + login.getDifficulty(), login.getMaxPlayers(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo() );
+ user.unsafe().sendPacket(modLogin); + user.unsafe().sendPacket(modLogin);