MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

fixed NPC interaction

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-12-29 18:37:42 -06:00
parent e66e430d30
commit 14a29c8612
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/BuildingManager.java
+1 -1
View File
@@ -438,7 +438,7 @@ public enum BuildingManager {
public static boolean IsPlayerHostile(Building building, PlayerCharacter player) { public static boolean IsPlayerHostile(Building building, PlayerCharacter player) {
if(building.getBlueprint().getBuildingGroup().equals(BuildingGroup.BANESTONE)) if(building.getBlueprint() != null && building.getBlueprint().getBuildingGroup() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.BANESTONE))
{ {
Guild playerNation = player.guild.getNation(); Guild playerNation = player.guild.getNation();
City banedCity = ZoneManager.getCityAtLocation(building.loc); City banedCity = ZoneManager.getCityAtLocation(building.loc);
src/engine/net/client/msg/VendorDialogMsg.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class VendorDialogMsg extends ClientNetMsg {
if (contract == null) if (contract == null)
vd = VendorDialog.getHostileVendorDialog(); vd = VendorDialog.getHostileVendorDialog();
else if (npc.getBuilding() != null) { else if (npc.getBuilding() != null) {
if (BuildingManager.IsPlayerHostile(npc.getBuilding(), playerCharacter)) if (npc.getBuilding() != null && BuildingManager.IsPlayerHostile(npc.getBuilding(), playerCharacter))
vd = VendorDialog.getHostileVendorDialog(); vd = VendorDialog.getHostileVendorDialog();
else else
vd = contract.getVendorDialog(); vd = contract.getVendorDialog();