Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
pull from: 2009Scape:master
merge into: Snowscape:upstream
Conversation 0 Commits 204 Files changed 719 +2 -2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5d37bb20b0 - Show all commits

4
Server/src/main/content/global/skill/construction/HouseZone.java
View file

@ -96,12 +96,12 @@ public final class HouseZone extends MapZone {
Player p = (Player) e; Player p = (Player) e;
// if the player is moving between the dungeon and main house, don't trigger the leave sequence // 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 // current loc
Location dest = p.getProperties().getTeleportLocation(); Location dest = p.getProperties().getTeleportLocation();
int currentRegionId = p.getLocation().getRegionId(); int currentRegionId = p.getLocation().getRegionId();
int houseId = house.getHouseRegion().getId(); int houseId = house.getHouseRegion().getId();
int dungeonId = (house.getDungeonRegion() != null) ? house.getDungeonRegion().getId() : -1; int dungeonId = house.getDungeonRegion().getId();
// check if still in house // check if still in house
boolean currentlyInHouse = (currentRegionId == houseId || currentRegionId == dungeonId); boolean currentlyInHouse = (currentRegionId == houseId || currentRegionId == dungeonId);