Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Set bindloc to slot location.

Browse Source
This commit is contained in:
MagicBot
2023-04-29 09:17:14 -04:00
parent ef367c2981
commit 84e24b4951
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/NPC.java
+8 -6
View File
@@ -341,7 +341,7 @@ public class NPC extends AbstractCharacter {
private void initializeNPC() { private void initializeNPC() {
int slot; int slot;
Vector3fImmutable bindLocation = Vector3fImmutable.ZERO; Vector3fImmutable slotLocation = Vector3fImmutable.ZERO;
if (ConfigManager.serverType.equals(ServerType.LOGINSERVER)) if (ConfigManager.serverType.equals(ServerType.LOGINSERVER))
return; return;
@@ -362,8 +362,7 @@ public class NPC extends AbstractCharacter {
this.bindLoc = this.parentZone.getLoc().add(this.bindLoc); this.bindLoc = this.parentZone.getLoc().add(this.bindLoc);
this.loc = bindLoc; this.loc = bindLoc;
// Add this npc to the hireling list. // Handle NPCs within buildings
// if slotted within a building
if (this.building != null) { if (this.building != null) {
@@ -374,9 +373,12 @@ public class NPC extends AbstractCharacter {
building.getHirelings().put(this, slot); building.getHirelings().put(this, slot);
this.bindLoc = BuildingManager.getSlotLocation(building, slot); slotLocation = BuildingManager.getSlotLocation(building, slot);
this.loc = BuildingManager.getSlotLocation(building, slot);
this.region = BuildingManager.GetRegion(this.building, bindLoc.x, bindLoc.y, bindLoc.z); this.bindLoc = building.getLoc().add(slotLocation);
this.loc = building.getLoc().add(slotLocation);
;
this.region = BuildingManager.GetRegion(this.building, slotLocation.x, slotLocation.y, slotLocation.z);
if (this.region != null) { if (this.region != null) {
this.buildingFloor = region.getRoom(); this.buildingFloor = region.getRoom();