mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Remove map cache
This commit is contained in:
parent
a24f684123
commit
0e81adb162
3 changed files with 5 additions and 64 deletions
|
@ -261,8 +261,6 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
|
||||||
@Setter
|
@Setter
|
||||||
private ItemMappings itemMappings;
|
private ItemMappings itemMappings;
|
||||||
|
|
||||||
private final Long2ObjectMap<ClientboundMapItemDataPacket> storedMaps = new Long2ObjectOpenHashMap<>();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Required to decode biomes correctly.
|
* Required to decode biomes correctly.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in
|
|
||||||
* all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
* THE SOFTWARE.
|
|
||||||
*
|
|
||||||
* @author GeyserMC
|
|
||||||
* @link https://github.com/GeyserMC/Geyser
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.geysermc.geyser.translator.protocol.bedrock;
|
|
||||||
|
|
||||||
import org.cloudburstmc.protocol.bedrock.packet.ClientboundMapItemDataPacket;
|
|
||||||
import org.cloudburstmc.protocol.bedrock.packet.MapInfoRequestPacket;
|
|
||||||
import org.geysermc.geyser.session.GeyserSession;
|
|
||||||
import org.geysermc.geyser.translator.protocol.PacketTranslator;
|
|
||||||
import org.geysermc.geyser.translator.protocol.Translator;
|
|
||||||
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
@Translator(packet = MapInfoRequestPacket.class)
|
|
||||||
public class BedrockMapInfoRequestTranslator extends PacketTranslator<MapInfoRequestPacket> {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void translate(GeyserSession session, MapInfoRequestPacket packet) {
|
|
||||||
long mapId = packet.getUniqueMapId();
|
|
||||||
|
|
||||||
ClientboundMapItemDataPacket mapPacket = session.getStoredMaps().remove(mapId);
|
|
||||||
if (mapPacket != null) {
|
|
||||||
// Delay the packet 100ms to prevent the client from ignoring the packet
|
|
||||||
session.scheduleInEventLoop(() -> session.sendUpstreamPacket(mapPacket),
|
|
||||||
100, TimeUnit.MILLISECONDS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -44,7 +44,6 @@ public class JavaMapItemDataTranslator extends PacketTranslator<ClientboundMapIt
|
||||||
@Override
|
@Override
|
||||||
public void translate(GeyserSession session, ClientboundMapItemDataPacket packet) {
|
public void translate(GeyserSession session, ClientboundMapItemDataPacket packet) {
|
||||||
org.cloudburstmc.protocol.bedrock.packet.ClientboundMapItemDataPacket mapItemDataPacket = new org.cloudburstmc.protocol.bedrock.packet.ClientboundMapItemDataPacket();
|
org.cloudburstmc.protocol.bedrock.packet.ClientboundMapItemDataPacket mapItemDataPacket = new org.cloudburstmc.protocol.bedrock.packet.ClientboundMapItemDataPacket();
|
||||||
boolean shouldStore = false;
|
|
||||||
|
|
||||||
mapItemDataPacket.setUniqueMapId(packet.getMapId());
|
mapItemDataPacket.setUniqueMapId(packet.getMapId());
|
||||||
mapItemDataPacket.setDimensionId(DimensionUtils.javaToBedrock(session.getDimension()));
|
mapItemDataPacket.setDimensionId(DimensionUtils.javaToBedrock(session.getDimension()));
|
||||||
|
@ -61,11 +60,6 @@ public class JavaMapItemDataTranslator extends PacketTranslator<ClientboundMapIt
|
||||||
mapItemDataPacket.setWidth(data.getColumns());
|
mapItemDataPacket.setWidth(data.getColumns());
|
||||||
mapItemDataPacket.setHeight(data.getRows());
|
mapItemDataPacket.setHeight(data.getRows());
|
||||||
|
|
||||||
// We have a full map image, this usually only happens on spawn for the initial image
|
|
||||||
if (mapItemDataPacket.getWidth() == 128 && mapItemDataPacket.getHeight() == 128) {
|
|
||||||
shouldStore = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Every int entry is an ARGB color
|
// Every int entry is an ARGB color
|
||||||
int[] colors = new int[data.getData().length];
|
int[] colors = new int[data.getData().length];
|
||||||
|
|
||||||
|
@ -87,12 +81,11 @@ public class JavaMapItemDataTranslator extends PacketTranslator<ClientboundMapIt
|
||||||
id++;
|
id++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Store the map to send when the client requests it, as bedrock expects the data after a MapInfoRequestPacket
|
// Client will ignore if sent too early
|
||||||
if (shouldStore) {
|
if (session.isSentSpawnPacket()) {
|
||||||
session.getStoredMaps().put(mapItemDataPacket.getUniqueMapId(), mapItemDataPacket);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send anyway just in case
|
|
||||||
session.sendUpstreamPacket(mapItemDataPacket);
|
session.sendUpstreamPacket(mapItemDataPacket);
|
||||||
|
} else {
|
||||||
|
session.getUpstream().queuePostStartGamePacket(mapItemDataPacket);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue