From c1ab21d21e0f11f5cbd1b79ffea43fc8d520b9f8 Mon Sep 17 00:00:00 2001 From: pietru Date: Mon, 31 Mar 2025 20:11:21 +0200 Subject: [PATCH] update for 0.4.5, add npc update per tick --- gradle.properties | 4 ++-- .../net/pietru/cookie_utils/CookieUtilsLogicRunner.java | 5 +++++ src/main/java/net/pietru/cookie_utils/npcs/NpcDef.java | 8 +++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index da0777f..1203e62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,9 +10,9 @@ id=cookie_utils # Dependency Versions cosmic_reach_rev=alpha -cosmic_reach_version=0.4.4 +cosmic_reach_version=0.4.6 # If unspecified, will use the version above -cosmic_reach_server_version=0.4.4 +cosmic_reach_server_version=0.4.6 cosmic_quilt_version=2.3.1 #2.2.0 diff --git a/src/main/java/net/pietru/cookie_utils/CookieUtilsLogicRunner.java b/src/main/java/net/pietru/cookie_utils/CookieUtilsLogicRunner.java index 898bf9c..633c292 100644 --- a/src/main/java/net/pietru/cookie_utils/CookieUtilsLogicRunner.java +++ b/src/main/java/net/pietru/cookie_utils/CookieUtilsLogicRunner.java @@ -3,6 +3,7 @@ package net.pietru.cookie_utils; import finalforeach.cosmicreach.util.FloatConsumer; import net.pietru.cookie_utils.api.Area; import net.pietru.cookie_utils.api.Region; +import net.pietru.cookie_utils.npcs.NpcDef; import net.pietru.cookie_utils.scripting.ExecutionContext; import net.pietru.cookie_utils.scripting.ScriptsDB; @@ -27,5 +28,9 @@ public class CookieUtilsLogicRunner implements FloatConsumer { ScriptsDB.run_script(area.scriptFile,"on_area_update", context); } } + + for (NpcDef def : NpcDef.registered_npc_list){ + def.send_update(); + } } } diff --git a/src/main/java/net/pietru/cookie_utils/npcs/NpcDef.java b/src/main/java/net/pietru/cookie_utils/npcs/NpcDef.java index cfba85c..921ee42 100644 --- a/src/main/java/net/pietru/cookie_utils/npcs/NpcDef.java +++ b/src/main/java/net/pietru/cookie_utils/npcs/NpcDef.java @@ -86,10 +86,12 @@ public class NpcDef { packet.viewDirOff.set(e.viewPositionOffset); packet.zoneId = player.zoneId; packet.playerFlags = 0; - addFlag(packet, PlayerPositionPacket.PLAYER_FLAG_SNEAKING, e.isSneaking()); - addFlag(packet, PlayerPositionPacket.PLAYER_FLAG_SPRINTING, player.isSprinting); + addFlag(packet,PlayerPositionPacket.PLAYER_FLAG_SNEAKING, e.isSneaking()); + addFlag(packet,PlayerPositionPacket.PLAYER_FLAG_SPRINTING, player.isSprinting); + addFlag(packet,PlayerPositionPacket.PLAYER_FLAG_PRONE, player.isProne); + addFlag(packet,PlayerPositionPacket.PLAYER_FLAG_ON_GROUND, e.isOnGround); - ServerSingletons.SERVER.broadcastToAll(packet); + ServerSingletons.SERVER.broadcast(this.zone,packet); return this; }