diff --git a/runelite-api/src/main/java/net/runelite/api/events/GameObjectSpawned.java b/runelite-api/src/main/java/net/runelite/api/events/GameObjectSpawned.java index 78ded8655c..4320fcf797 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/GameObjectSpawned.java +++ b/runelite-api/src/main/java/net/runelite/api/events/GameObjectSpawned.java @@ -24,22 +24,22 @@ */ package net.runelite.api.events; +import lombok.Value; import net.runelite.api.GameObject; import net.runelite.api.Tile; -import lombok.Data; /** * An event where a {@link GameObject} is added to a {@link Tile}. */ -@Data +@Value public class GameObjectSpawned implements Event { /** * The affected tile. */ - private Tile tile; + Tile tile; /** * The newly spawned game object. */ - private GameObject gameObject; + GameObject gameObject; } diff --git a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java index dd48a2f0f1..bc2ab91b3d 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java +++ b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java @@ -170,9 +170,7 @@ public class GameEventManager .filter(Objects::nonNull) .forEach(object -> { - final GameObjectSpawned objectSpawned = new GameObjectSpawned(); - objectSpawned.setTile(tile); - objectSpawned.setGameObject(object); + final GameObjectSpawned objectSpawned = new GameObjectSpawned(tile, object); eventBus.post(GameObjectSpawned.class, objectSpawned); }); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java index 05938e95ff..06ff17d4fd 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java @@ -432,9 +432,7 @@ public abstract class RSTileMixin implements RSTile logger.trace("Game object spawn: {}", current.getId()); - GameObjectSpawned gameObjectSpawned = new GameObjectSpawned(); - gameObjectSpawned.setTile(this); - gameObjectSpawned.setGameObject(current); + GameObjectSpawned gameObjectSpawned = new GameObjectSpawned(this, current); client.getCallbacks().post(GameObjectSpawned.class, gameObjectSpawned); } else