GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fix bug with maps

Browse source
This commit is contained in:
AJ Ferguson 2020-07-06 15:52:38 -08:00
parent 02905c2a35
commit 699402e635
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file

@ -48,6 +48,7 @@ import com.nukkitx.protocol.bedrock.BedrockServerSession;
import com.nukkitx.protocol.bedrock.data.*; import com.nukkitx.protocol.bedrock.data.*;
import com.nukkitx.protocol.bedrock.packet.*; import com.nukkitx.protocol.bedrock.packet.*;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectMaps;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.Object2LongMap; import it.unimi.dsi.fastutil.objects.Object2LongMap;
import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
@ -107,7 +108,7 @@ public class GeyserSession implements CommandSender {
private TeleportCache teleportCache; private TeleportCache teleportCache;
@Getter @Getter
private final Long2ObjectMap<ClientboundMapItemDataPacket> storedMaps = new Long2ObjectOpenHashMap<>(); private final Long2ObjectMap<ClientboundMapItemDataPacket> storedMaps = Long2ObjectMaps.synchronize(new Long2ObjectOpenHashMap<>());
/** /**
* A map of Vector3i positions to Java entity IDs. * A map of Vector3i positions to Java entity IDs.

11
connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockMapInfoRequestTranslator.java
View file

@ -25,6 +25,7 @@
package org.geysermc.connector.network.translators.bedrock; package org.geysermc.connector.network.translators.bedrock;
import com.nukkitx.protocol.bedrock.packet.ClientboundMapItemDataPacket;
import com.nukkitx.protocol.bedrock.packet.MapInfoRequestPacket; import com.nukkitx.protocol.bedrock.packet.MapInfoRequestPacket;
import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.GeyserConnector;
import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.session.GeyserSession;
@ -39,16 +40,14 @@ public class BedrockMapInfoRequestTranslator extends PacketTranslator<MapInfoReq
@Override @Override
public void translate(MapInfoRequestPacket packet, GeyserSession session) { public void translate(MapInfoRequestPacket packet, GeyserSession session) {
long mapID = packet.getUniqueMapId(); long mapID = packet.getUniqueMapId();
if (mapID <= -1l) {
mapID = 0l;
}
if (session.getStoredMaps().containsKey(mapID)) { if (session.getStoredMaps().containsKey(mapID)) {
// Delay the packet 100ms to prevent the client from ignoring the packet // Delay the packet 100ms to prevent the client from ignoring the packet
long finalMapID = mapID;
GeyserConnector.getInstance().getGeneralThreadPool().schedule(() -> { GeyserConnector.getInstance().getGeneralThreadPool().schedule(() -> {
session.sendUpstreamPacket(session.getStoredMaps().get(finalMapID)); ClientboundMapItemDataPacket mapPacket = session.getStoredMaps().remove(mapID);
session.getStoredMaps().remove(finalMapID); if (mapPacket != null) {
session.sendUpstreamPacket(mapPacket);
}
}, 100, TimeUnit.MILLISECONDS); }, 100, TimeUnit.MILLISECONDS);
} }
} }

6
connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaMapDataTranslator.java
View file

@ -85,11 +85,7 @@ public class JavaMapDataTranslator extends PacketTranslator<ServerMapDataPacket>
// Store the map to send when the client requests it, as bedrock expects the data after a MapInfoRequestPacket // Store the map to send when the client requests it, as bedrock expects the data after a MapInfoRequestPacket
if (shouldStore) { if (shouldStore) {
long uniqueMapId = mapItemDataPacket.getUniqueMapId(); session.getStoredMaps().put(mapItemDataPacket.getUniqueMapId(), mapItemDataPacket);
if (uniqueMapId <= -1l) {
uniqueMapId = 0l;
}
session.getStoredMaps().put(uniqueMapId, mapItemDataPacket);
} }
// Send anyway just in case // Send anyway just in case