OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fixed two bugs that could lead to toggling of worldmap replace areas

Browse Source
This commit is contained in:
Gonk
2020-05-18 19:04:45 +02:00
parent efca0a905a
commit e0d0f71603
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
View File

@@ -193,7 +193,7 @@ public final class MapController {
else ConversationController.requirementFulfilled(world, replacement.requirement, controllers);
tileMap.applyReplacement(replacement);
for (ReplaceableMapSection impactedReplacement : tileMap.replacements) {
if (impactedReplacement.isApplied && impactedReplacement.replacementArea.intersects(replacement.replacementArea)) {
if (replacement != impactedReplacement && impactedReplacement.isApplied && impactedReplacement.replacementArea.intersects(replacement.replacementArea)) {
//The applied replacement has overwritten changes made by a previously applied replacement.
//This previous replacement must now be considered as unapplied to let it be reapplied later eventually.
impactedReplacement.isApplied = false;
@@ -209,7 +209,7 @@ public final class MapController {
hasUpdated = true;
}
}
if (map.lastSeenLayoutHash != tileMap.getCurrentLayoutHash()) {
if (!map.lastSeenLayoutHash.equalsIgnoreCase(tileMap.getCurrentLayoutHash())) {
map.lastSeenLayoutHash = tileMap.getCurrentLayoutHash();
hasUpdated = true;
}