Fix Waypoint crash

Avanatiker · Avanatiker · commit e9142e59ee62 · 2023-03-02T06:42:20.000+01:00
diff --git a/src/main/kotlin/com/lambda/client/manager/managers/WaypointManager.kt b/src/main/kotlin/com/lambda/client/manager/managers/WaypointManager.kt
@@ -97,10 +97,10 @@ object WaypointManager : Manager {
     }
 
     fun remove(pos: BlockPos, currentDimension: Boolean = false): Boolean {
-        val waypoint = get(pos, currentDimension)
-        val removed = waypoints.remove(waypoint)
-        LambdaEventBus.post(WaypointUpdateEvent(WaypointUpdateEvent.Type.REMOVE, waypoint))
-        return removed
+        return get(pos, currentDimension)?.let { waypoint ->
+            LambdaEventBus.post(WaypointUpdateEvent(WaypointUpdateEvent.Type.REMOVE, waypoint))
+            waypoints.remove(waypoint)
+        } ?: false
     }
 
     fun remove(id: Int): Boolean {

Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,10 @@ object WaypointManager : Manager {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`fun remove(pos: BlockPos, currentDimension: Boolean = false): Boolean {`
`100`		`- val waypoint = get(pos, currentDimension)`
`101`		`- val removed = waypoints.remove(waypoint)`
`102`		`- LambdaEventBus.post(WaypointUpdateEvent(WaypointUpdateEvent.Type.REMOVE, waypoint))`
`103`		`- return removed`
	`100`	`+ return get(pos, currentDimension)?.let { waypoint ->`
	`101`	`+ LambdaEventBus.post(WaypointUpdateEvent(WaypointUpdateEvent.Type.REMOVE, waypoint))`
	`102`	`+ waypoints.remove(waypoint)`
	`103`	`+ } ?: false`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`fun remove(id: Int): Boolean {`