Contact npcs/mobs have derived locations. 0x0 in cache data.

This commit is contained in:
2023-04-29 16:02:22 -04:00
parent 48d66a0d42
commit cfb4f38d15
2 changed files with 7 additions and 14 deletions
@@ -4,7 +4,6 @@ import engine.Enum;
import engine.Enum.ItemType;
import engine.exception.MsgSendException;
import engine.gameManager.*;
import engine.math.Vector3fImmutable;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
@@ -79,8 +78,6 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
if (building.getBlueprint().getMaxSlots() == building.getHirelings().size())
return false;
Vector3fImmutable NpcLoc = new Vector3fImmutable(building.getLoc());
Item contractItem = Item.getFromCache(msg.getContractItem());
if (contractItem == null)
@@ -93,7 +90,7 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
itemMan = player.getCharItemManager();
zone = ZoneManager.findSmallestZone(NpcLoc);
zone = ZoneManager.findSmallestZone(building.getLoc());
if (zone == null)
return false;
@@ -108,7 +105,7 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
if (contract.canSlotinBuilding(building) == false)
return false;
if (!BuildingManager.addHireling(building, player, NpcLoc, zone, contract, contractItem))
if (!BuildingManager.addHireling(building, player, zone, contract, contractItem))
return false;
itemMan.delete(contractItem);