mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-11 11:28:03 +07:00
Code Issues Packages Projects Releases Wiki Activity

Solved rare teleport bug

Browse Source
This commit is contained in:
Yair Morgenstern 2021-07-27 22:50:55 +03:00
parent 7abaa11fd4
commit eb7cf85482
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -479,7 +479,7 @@ class CityInfo {
// Edge case! What if a water unit is in a city, and you raze the city?
// Well, the water unit has to return to the water!
for (unit in getCenterTile().getUnits()) {
for (unit in getCenterTile().getUnits().toList()) {
if (!unit.movement.canPassThrough(getCenterTile()))
unit.movement.teleportToClosestMoveableTile()
}

5
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -340,7 +340,8 @@ class DiplomacyManager() {
hasOpenBorders = newHasOpenBorders
if (bordersWereClosed) { // borders were closed, get out!
for (unit in civInfo.getCivUnits().filter { it.currentTile.getOwner()?.civName == otherCivName }) {
for (unit in civInfo.getCivUnits()
.filter { it.currentTile.getOwner()?.civName == otherCivName }.toList()) {
unit.movement.teleportToClosestMoveableTile()
}
}
@ -597,7 +598,7 @@ class DiplomacyManager() {
diplomaticStatus = DiplomaticStatus.Peace
val otherCiv = otherCiv()
// Get out of others' territory
for (unit in civInfo.getCivUnits().filter { it.getTile().getOwner() == otherCiv })
for (unit in civInfo.getCivUnits().filter { it.getTile().getOwner() == otherCiv }.toList())
unit.movement.teleportToClosestMoveableTile()
for (thirdCiv in civInfo.getKnownCivs()) {

8
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View File

@ -291,6 +291,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
* This will not use movement points or check for a possible route.
* It is used e.g. if an enemy city expands its borders, or trades or diplomacy change a unit's
* allowed position.
* CAN DESTROY THE UNIT.
*/
fun teleportToClosestMoveableTile() {
var allowedTile: TileInfo? = null
@ -310,13 +311,16 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
if (allowedTile != null) break
}
}
unit.removeFromTile() // we "teleport" them away
if (allowedTile != null) { // it's possible that there is no close tile, and all the guy's cities are full. Screw him then.
if (allowedTile != null) {
unit.removeFromTile() // we "teleport" them away
unit.putInTile(allowedTile)
// Cancel sleep or fortification if forcibly displaced - for now, leave movement / auto / explore orders
if (unit.isSleeping() || unit.isFortified())
unit.action = null
}
// it's possible that there is no close tile, and all the guy's cities are full.
// Nothing we can do.
else unit.destroy()
}
fun moveToTile(destination: TileInfo) {