v3.1.0: fixed wrong cases if canPlaceChar called super.canPlaceItem
in these cases both super methods did the same thing so this changes no actual functionality
This commit is contained in:
+1
-1
@@ -76,7 +76,7 @@ public class RitualSiteRoom extends StandardRoom {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canPlaceCharacter(Point p, Level l) {
|
public boolean canPlaceCharacter(Point p, Level l) {
|
||||||
return super.canPlaceItem(p, l) && l.distance(CeremonialCandle.ritualPos, l.pointToCell(p)) >= 2;
|
return super.canPlaceCharacter(p, l) && l.distance(CeremonialCandle.ritualPos, l.pointToCell(p)) >= 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class RitualMarker extends CustomTilemap {
|
public static class RitualMarker extends CustomTilemap {
|
||||||
|
|||||||
+1
-1
@@ -66,7 +66,7 @@ public class CavesFissureRoom extends StandardRoom {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canPlaceCharacter(Point p, Level l) {
|
public boolean canPlaceCharacter(Point p, Level l) {
|
||||||
return super.canPlaceItem(p, l) && l.map[l.pointToCell(p)] != Terrain.EMPTY_SP;
|
return super.canPlaceCharacter(p, l) && l.map[l.pointToCell(p)] != Terrain.EMPTY_SP;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public abstract class StandardBridgeRoom extends StandardRoom {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canPlaceCharacter(Point p, Level l) {
|
public boolean canPlaceCharacter(Point p, Level l) {
|
||||||
return super.canPlaceItem(p, l) && (spaceRect == null || !spaceRect.inside(p));
|
return super.canPlaceCharacter(p, l) && (spaceRect == null || !spaceRect.inside(p));
|
||||||
}
|
}
|
||||||
|
|
||||||
//keep these so that subclasses can use them in their methods
|
//keep these so that subclasses can use them in their methods
|
||||||
|
|||||||
Reference in New Issue
Block a user