From c5f10254782577a7404de892b3c7f93be43dd9c3 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 26 Mar 2025 14:51:08 -0400 Subject: [PATCH] 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 --- .../levels/rooms/quest/RitualSiteRoom.java | 2 +- .../levels/rooms/standard/CavesFissureRoom.java | 2 +- .../levels/rooms/standard/StandardBridgeRoom.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/quest/RitualSiteRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/quest/RitualSiteRoom.java index 054722055..9ef7f6956 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/quest/RitualSiteRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/quest/RitualSiteRoom.java @@ -76,7 +76,7 @@ public class RitualSiteRoom extends StandardRoom { @Override 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 { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/CavesFissureRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/CavesFissureRoom.java index 1c2396387..ecad40240 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/CavesFissureRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/CavesFissureRoom.java @@ -66,7 +66,7 @@ public class CavesFissureRoom extends StandardRoom { @Override 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 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardBridgeRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardBridgeRoom.java index eb765371b..e48c3c7a2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardBridgeRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardBridgeRoom.java @@ -58,7 +58,7 @@ public abstract class StandardBridgeRoom extends StandardRoom { @Override 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