Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-12-26 16:12:46 +01:00
Better logic for item updating on item entities
Specifically created to address InteractionVisualizer updating all metadata properties when updating the nametag - this commit prevents the item from jumping on updating. It also prevents the entity from being respawned if just the stack size updated.
Dieser Commit ist enthalten in:
Ursprung
c3f65b176d
Commit
11f048a065
@ -29,9 +29,11 @@ import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadat
|
|||||||
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
|
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
|
||||||
import com.nukkitx.math.vector.Vector3f;
|
import com.nukkitx.math.vector.Vector3f;
|
||||||
import com.nukkitx.math.vector.Vector3i;
|
import com.nukkitx.math.vector.Vector3i;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.entity.EntityEventType;
|
||||||
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
|
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
|
||||||
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
|
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
|
||||||
import com.nukkitx.protocol.bedrock.packet.AddItemEntityPacket;
|
import com.nukkitx.protocol.bedrock.packet.AddItemEntityPacket;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.EntityEventPacket;
|
||||||
import org.geysermc.connector.entity.type.EntityType;
|
import org.geysermc.connector.entity.type.EntityType;
|
||||||
import org.geysermc.connector.network.session.GeyserSession;
|
import org.geysermc.connector.network.session.GeyserSession;
|
||||||
import org.geysermc.connector.network.translators.item.ItemTranslator;
|
import org.geysermc.connector.network.translators.item.ItemTranslator;
|
||||||
@ -115,10 +117,27 @@ public class ItemEntity extends ThrowableEntity {
|
|||||||
@Override
|
@Override
|
||||||
public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
|
public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
|
||||||
if (entityMetadata.getId() == 8) {
|
if (entityMetadata.getId() == 8) {
|
||||||
item = ItemTranslator.translateToBedrock(session, (ItemStack) entityMetadata.getValue());
|
ItemData item = ItemTranslator.translateToBedrock(session, (ItemStack) entityMetadata.getValue());
|
||||||
|
if (this.item == null) {
|
||||||
|
this.item = item;
|
||||||
|
spawnEntity(session);
|
||||||
|
} else if (item.equals(this.item, false, true, true)) {
|
||||||
|
// Don't bother respawning the entity if items are equal
|
||||||
|
if (this.item.getCount() != item.getCount()) {
|
||||||
|
// Just item count updated; let's make this easy
|
||||||
|
this.item = item;
|
||||||
|
EntityEventPacket packet = new EntityEventPacket();
|
||||||
|
packet.setRuntimeEntityId(geyserId);
|
||||||
|
packet.setType(EntityEventType.UPDATE_ITEM_STACK_SIZE);
|
||||||
|
packet.setData(this.item.getCount());
|
||||||
|
session.sendUpstreamPacket(packet);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.item = item;
|
||||||
despawnEntity(session);
|
despawnEntity(session);
|
||||||
spawnEntity(session);
|
spawnEntity(session);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
super.updateBedrockMetadata(entityMetadata, session);
|
super.updateBedrockMetadata(entityMetadata, session);
|
||||||
}
|
}
|
||||||
|
@ -44,6 +44,7 @@ import org.geysermc.connector.registry.type.ItemMappings;
|
|||||||
import org.geysermc.connector.utils.FileUtils;
|
import org.geysermc.connector.utils.FileUtils;
|
||||||
import org.geysermc.connector.utils.LocaleUtils;
|
import org.geysermc.connector.utils.LocaleUtils;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@ -125,6 +126,7 @@ public abstract class ItemTranslator {
|
|||||||
return itemStack;
|
return itemStack;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Nonnull
|
||||||
public static ItemData translateToBedrock(GeyserSession session, ItemStack stack) {
|
public static ItemData translateToBedrock(GeyserSession session, ItemStack stack) {
|
||||||
if (stack == null) {
|
if (stack == null) {
|
||||||
return ItemData.AIR;
|
return ItemData.AIR;
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren