diff --git a/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt b/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt index 52cbfd52a..6a7b8802a 100644 --- a/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt +++ b/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt @@ -63,16 +63,11 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando "Lava Maze mining site" to Location.create(3062, 3885, 0), // Wilderness rune mine "Mage Arena bank" to Location.create(3093, 3962, 0) // Mage Arena bank ) + val starSprite = NPC(8091) var location = "Canifis Bank" - val loc = crash_locations[location] - val starSprite = let { - val npc = NPC(8091) - npc.location = loc - npc - } var maxDust = level.totalStardust var dustLeft = level.totalStardust - var starObject = Scenery(level.objectId, loc) + var starObject = Scenery(level.objectId, crash_locations.get(location)) var isDiscovered = false var ticks = 0 var isSpawned = false diff --git a/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt b/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt index 0c938aec5..57849d1db 100644 --- a/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt +++ b/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt @@ -135,8 +135,8 @@ class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Com } override fun defineCommands() { - define("tostar", Privilege.ADMIN, description = "Teleports you inside the currently active star.") { player, _ -> - teleport(player, star.starObject.location.transform(0, 0, 0)) + define("tostar", Privilege.ADMIN, description = "Teleports you adjacent to the currently active star.") { player, _ -> + teleport(player, star.starObject.location.transform(1,1,0)) } define("submit", Privilege.ADMIN, description = "Rebuilds and fires the shooting star event immediately.") { _, _ ->