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

Check if spawner contains entity type (#3450)

Browse source
This commit is contained in:
Konicai 2022-12-11 00:01:36 -05:00 committed by GitHub
parent 6876a90c3b
commit 2d63f09e16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/src/main/java/org/geysermc/geyser/translator/level/block/entity/SpawnerBlockEntityTranslator.java
View file

@ -27,6 +27,7 @@ package org.geysermc.geyser.translator.level.block.entity;
import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType; import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag; import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.nukkitx.nbt.NbtMapBuilder; import com.nukkitx.nbt.NbtMapBuilder;
import org.geysermc.geyser.entity.EntityDefinition; import org.geysermc.geyser.entity.EntityDefinition;
@ -68,16 +69,18 @@ public class SpawnerBlockEntityTranslator extends BlockEntityTranslator {
CompoundTag spawnData = tag.get("SpawnData"); CompoundTag spawnData = tag.get("SpawnData");
if (spawnData != null) { if (spawnData != null) {
String entityID = (String) ((CompoundTag) spawnData.get("entity")) StringTag idTag = ((CompoundTag) spawnData.get("entity")).get("id");
.get("id") if (idTag != null) {
.getValue(); // As of 1.19.3, spawners can be empty
builder.put("EntityIdentifier", entityID); String entityId = idTag.getValue();
builder.put("EntityIdentifier", entityId);
EntityDefinition<?> definition = Registries.JAVA_ENTITY_IDENTIFIERS.get(entityID); EntityDefinition<?> definition = Registries.JAVA_ENTITY_IDENTIFIERS.get(entityId);
if (definition != null) { if (definition != null) {
builder.put("DisplayEntityWidth", definition.width()); builder.put("DisplayEntityWidth", definition.width());
builder.put("DisplayEntityHeight", definition.height()); builder.put("DisplayEntityHeight", definition.height());
builder.put("DisplayEntityScale", 1.0f); builder.put("DisplayEntityScale", 1.0f);
}
} }
} }