yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Another potential fix for construction"

Browse Source 
This reverts commit cf6fbf23
This commit is contained in:
ceikry
2021-07-05 13:24:29 -05:00
parent cea8c806fa
commit 8a231f1898
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/node/entity/skill/construction/HouseManager.java
+1 -5
View File
@@ -267,9 +267,6 @@ public final class HouseManager {
int diffX = player.getLocation().getX() - r.getBaseLocation().getX(); int diffX = player.getLocation().getX() - r.getBaseLocation().getX();
int diffY = player.getLocation().getY() - r.getBaseLocation().getY(); int diffY = player.getLocation().getY() - r.getBaseLocation().getY();
int diffZ = player.getLocation().getZ() - r.getBaseLocation().getZ(); int diffZ = player.getLocation().getZ() - r.getBaseLocation().getZ();
RegionManager.getRegionCache().remove(r);
region.flagInactive();
dungeon.flagInactive();
region = null; region = null;
dungeon = null; dungeon = null;
enter(player, buildingMode, false); enter(player, buildingMode, false);
@@ -381,8 +378,7 @@ public final class HouseManager {
Region.load(from, true); Region.load(from, true);
RegionChunk defaultChunk = from.getPlanes()[style.getPlane()].getRegionChunk(1, 0); RegionChunk defaultChunk = from.getPlanes()[style.getPlane()].getRegionChunk(1, 0);
ZoneBorders borders = DynamicRegion.reserveArea(8, 8); ZoneBorders borders = DynamicRegion.reserveArea(8, 8);
//region = DynamicRegion.create(from.getRegionId()); region = new DynamicRegion(-1, borders.getSouthWestX() >> 6, borders.getSouthWestY() >> 6);
region = new DynamicRegion(from.getRegionId(), borders.getSouthWestX() >> 6, borders.getSouthWestY() >> 6);
region.setBorders(borders); region.setBorders(borders);
region.setUpdateAllPlanes(true); region.setUpdateAllPlanes(true);
RegionManager.addRegion(region.getId(), region); RegionManager.addRegion(region.getId(), region);
Server/src/main/java/core/game/node/entity/skill/construction/HouseZone.java
-6
View File
@@ -3,7 +3,6 @@ package core.game.node.entity.skill.construction;
import core.game.node.entity.Entity; import core.game.node.entity.Entity;
import core.game.node.entity.player.Player; import core.game.node.entity.player.Player;
import core.game.world.map.RegionManager;
import core.game.world.map.zone.MapZone; import core.game.world.map.zone.MapZone;
import core.game.world.map.zone.ZoneRestriction; import core.game.world.map.zone.ZoneRestriction;
@@ -71,11 +70,6 @@ public final class HouseZone extends MapZone {
if (e instanceof Player) { if (e instanceof Player) {
Player p = (Player) e; Player p = (Player) e;
HouseManager.leave(p); HouseManager.leave(p);
if(house.getRegion() == p.getHouseManager().getRegion()){
house.getRegion().flagActive();
house.getDungeonRegion().flagActive();
RegionManager.getRegionCache().remove(house.getRegion());
}
return true; return true;
} }
} }