*Fixed early morning code

This commit is contained in:
Hellfish
2013-06-01 11:55:01 +00:00
parent 8f3167ec39
commit be10997f8e

View File

@@ -35,22 +35,34 @@ public class ReplaceMoved extends ReplacementEffect {
return false;
}
}
boolean matchedZone = false;
if (this.getMapParams().containsKey("Origin")) {
for(ZoneType z : ZoneType.listValueOf(this.getMapParams().get("Origin"))) {
if(z == (ZoneType) runParams.get("Origin"))
return true;
matchedZone = true;
}
return false;
if(!matchedZone)
{
return false;
}
}
if (this.getMapParams().containsKey("Destination")) {
matchedZone = false;
for(ZoneType z : ZoneType.listValueOf(this.getMapParams().get("Destination"))) {
if(z == (ZoneType) runParams.get("Destination"))
return true;
matchedZone = true;
}
return false;
if(!matchedZone)
{
return false;
}
}
return true;
}