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 #4683

Browse source
This commit is contained in:
Camotoy 2024-05-21 20:37:18 -04:00
parent a780eeaae8
commit 96bfda2ed3
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/src/main/java/org/geysermc/geyser/session/cache/LodestoneCache.java vendored
View file

@ -28,7 +28,6 @@ package org.geysermc.geyser.session.cache;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.inventory.GeyserItemStack;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.GlobalPos;
import org.geysermc.mcprotocollib.protocol.data.game.item.component.LodestoneTracker;
@ -53,11 +52,13 @@ public final class LodestoneCache {
private int id = 1;
public void cacheInventoryItem(GeyserItemStack itemStack, LodestoneTracker tracker) {
GlobalPos position = tracker.getPos();
if (!tracker.isTracked()) {
return;
}
GlobalPos position = tracker.getPos();
if (position == null) {
GeyserImpl.getInstance().getLogger().error("Position is null. Find out why.");
Thread.dumpStack();
// As of 1.20.6, position can still be null even if tracking is enabled.
return;
}
int x = position.getX();
@ -84,13 +85,16 @@ public final class LodestoneCache {
}
public int store(LodestoneTracker tracker) {
GlobalPos position = tracker.getPos();
if (position == null) {
GeyserImpl.getInstance().getLogger().error("Position is null. Find out why.");
Thread.dumpStack();
return -1;
if (!tracker.isTracked()) {
// No coordinates; nothing to convert
return 0;
}
GlobalPos position = tracker.getPos();
if (position == null) {
return 0;
}
int x = position.getX();
int y = position.getY();
int z = position.getZ();