Repo-Mirror/GeyserUtils
9
0
Fork 0
mirror of https://github.com/GeyserExtensionists/GeyserUtils.git synced 2025-12-19 15:09:24 +00:00
Code Issues Releases Activity

Fix

Browse Source
This commit is contained in:
zimzaza4
2025-10-15 12:41:27 +08:00
parent 51c5998f80
commit 2dcb2b81f9
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java
View File

@@ -142,10 +142,9 @@ public class GeyserUtils implements Extension {
ENTITIES_WAIT_FOR_LOAD.add(entityId); ENTITIES_WAIT_FOR_LOAD.add(entityId);
} }
public static void registerPropertiesForGeyser(String entityId) { public static NbtMap registerPropertiesForGeyser(String entityId) {
GeyserEntityProperties.Builder builder = getProperties(entityId); GeyserEntityProperties.Builder builder = getProperties(entityId);
if (builder == null) return; if (builder == null) return null;
GeyserEntityProperties entityProperties = builder.build(); GeyserEntityProperties entityProperties = builder.build();
properties.values().stream() properties.values().stream()
.flatMap(List::stream) .flatMap(List::stream)
@@ -154,14 +153,12 @@ public class GeyserUtils implements Extension {
Registries.BEDROCK_ENTITY_PROPERTIES.get().removeIf(i -> i.containsKey(id)); Registries.BEDROCK_ENTITY_PROPERTIES.get().removeIf(i -> i.containsKey(id));
}); });
Registries.BEDROCK_ENTITY_PROPERTIES.get().add(entityProperties.toNbtMap(entityId));
EntityDefinition old = LOADED_ENTITY_DEFINITIONS.get(entityId); EntityDefinition old = LOADED_ENTITY_DEFINITIONS.get(entityId);
LOADED_ENTITY_DEFINITIONS.replace(entityId, new EntityDefinition(old.factory(), old.entityType(), old.identifier(), LOADED_ENTITY_DEFINITIONS.replace(entityId, new EntityDefinition(old.factory(), old.entityType(), old.identifier(),
old.width(), old.height(), old.offset(), entityProperties, old.translators())); old.width(), old.height(), old.offset(), entityProperties, old.translators()));
instance.logger().info("Defined entity: " + entityId + " in registry."); instance.logger().info("Defined entity: " + entityId + " in registry.");
return entityProperties.toNbtMap(entityId);
} }
public static void addCustomEntity(String id) { public static void addCustomEntity(String id) {
@@ -351,9 +348,14 @@ public class GeyserUtils implements Extension {
for (String registeredEntity : REGISTERED_ENTITIES) { for (String registeredEntity : REGISTERED_ENTITIES) {
registerEntityToGeyser(registeredEntity); registerEntityToGeyser(registeredEntity);
} }
Set<NbtMap> entityProperties = new HashSet<>();
for (String id : ENTITIES_WAIT_FOR_LOAD) { for (String id : ENTITIES_WAIT_FOR_LOAD) {
registerPropertiesForGeyser(id); NbtMap map = registerPropertiesForGeyser(id);
if (map == null) continue;
entityProperties.add(map);
} }
// Prevent Error: "Cannot add properties outside the GeyserDefineEntityProperties event!"
scheduler.schedule(() -> Registries.BEDROCK_ENTITY_PROPERTIES.get().addAll(entityProperties), 1, TimeUnit.SECONDS);
} }
public void replaceTranslator() { public void replaceTranslator() {