mirror of
https://gitlab.com/2009scape/2009scape.git
synced 2026-08-24 11:55:13 -06:00
Merge branch 2009scape:master into master
This commit is contained in:
commit
7909bfe6f3
1 changed files with 2 additions and 2 deletions
|
|
@ -96,12 +96,12 @@ public final class HouseZone extends MapZone {
|
|||
Player p = (Player) e;
|
||||
|
||||
// if the player is moving between the dungeon and main house, don't trigger the leave sequence
|
||||
if (!logout) {
|
||||
if (house.getDungeonRegion() != null && !logout) {
|
||||
// current loc
|
||||
Location dest = p.getProperties().getTeleportLocation();
|
||||
int currentRegionId = p.getLocation().getRegionId();
|
||||
int houseId = house.getHouseRegion().getId();
|
||||
int dungeonId = (house.getDungeonRegion() != null) ? house.getDungeonRegion().getId() : -1;
|
||||
int dungeonId = house.getDungeonRegion().getId();
|
||||
|
||||
// check if still in house
|
||||
boolean currentlyInHouse = (currentRegionId == houseId || currentRegionId == dungeonId);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue