Project cleanup pre merge.

This commit is contained in:
2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
@@ -24,116 +24,108 @@ import engine.objects.Zone;
*/
public class RepairBuildingMsgHandler extends AbstractClientMsgHandler {
public RepairBuildingMsgHandler() {
super(RepairBuildingMsg.class);
}
public RepairBuildingMsgHandler() {
super(RepairBuildingMsg.class);
}
@Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException {
private static void RepairBuilding(Building targetBuilding, ClientConnection origin, RepairBuildingMsg msg) {
// Member variable declaration
// Member variable declaration
PlayerCharacter player;
Building targetBuilding;
RepairBuildingMsg msg;
Zone serverZone;
Dispatch dispatch;
// Member variable assignment
if (targetBuilding == null)
return;
if (!targetBuilding.hasFunds(BuildingManager.GetRepairCost(targetBuilding)))
return;
PlayerCharacter pc = origin.getPlayerCharacter();
serverZone = ZoneManager.findSmallestZone(pc.getLoc());
if (serverZone.getPlayerCityUUID() == 0 && targetBuilding.getBlueprint() != null && targetBuilding.getBlueprint().getBuildingGroup() != BuildingGroup.MINE)
return;
// Member variable assignment
City city = City.GetCityFromCache(serverZone.getPlayerCityUUID());
msg = (RepairBuildingMsg) baseMsg;
if (city != null) {
if (city.getBane() != null && city.protectionEnforced == false)
return;
player = SessionManager.getPlayerCharacter(origin);
}
if (player == null)
return true;
//cannot repair mines during 24/7 activity.
if (targetBuilding.getBlueprint() != null && targetBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.MINE) {
return;
}
int maxHP = (int) targetBuilding.getMaxHitPoints();
int repairCost = BuildingManager.GetRepairCost(targetBuilding);
int missingHealth = (int) BuildingManager.GetMissingHealth(targetBuilding);
switch (msg.getType()) {
case 0:
targetBuilding = BuildingManager.getBuildingFromCache(msg.getBuildingID());
RepairBuilding(targetBuilding, origin, msg);
break;
if (!targetBuilding.transferGold(-repairCost, false))
return;
// targetBuilding.createFurniture(item.getItemBase().getUseID(), 0, msg.getFurnitureLoc(), Vector3f.ZERO, 0, player);
targetBuilding.modifyHealth(BuildingManager.GetMissingHealth(targetBuilding), null);
UpdateObjectMsg uom = new UpdateObjectMsg(targetBuilding, 3);
dispatch = Dispatch.borrow(origin.getPlayerCharacter(), uom);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
}
RepairBuildingMsg rbm = new RepairBuildingMsg(targetBuilding.getObjectUUID(), maxHP, missingHealth, repairCost, targetBuilding.getStrongboxValue());
dispatch = Dispatch.borrow(origin.getPlayerCharacter(), rbm);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
}
@Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException {
// Member variable declaration
PlayerCharacter player;
Building targetBuilding;
RepairBuildingMsg msg;
// dispatch = Dispatch.borrow(player, baseMsg);
// DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
// Member variable assignment
return true;
msg = (RepairBuildingMsg) baseMsg;
}
player = SessionManager.getPlayerCharacter(origin);
private static void RepairBuilding(Building targetBuilding, ClientConnection origin, RepairBuildingMsg msg) {
// Member variable declaration
Zone serverZone;
Dispatch dispatch;
// Member variable assignment
if (targetBuilding == null)
return;
if (!targetBuilding.hasFunds(BuildingManager.GetRepairCost(targetBuilding)))
return;
PlayerCharacter pc = origin.getPlayerCharacter();
serverZone = ZoneManager.findSmallestZone(pc.getLoc());
if (serverZone.getPlayerCityUUID() == 0 && targetBuilding.getBlueprint() != null && targetBuilding.getBlueprint().getBuildingGroup() != BuildingGroup.MINE)
return;
if (player == null)
return true;
City city = City.GetCityFromCache(serverZone.getPlayerCityUUID());
switch (msg.getType()) {
case 0:
targetBuilding = BuildingManager.getBuildingFromCache(msg.getBuildingID());
RepairBuilding(targetBuilding, origin, msg);
break;
if (city != null){
if(city.getBane() != null && city.protectionEnforced == false)
return;
}
//cannot repair mines during 24/7 activity.
if (targetBuilding.getBlueprint() != null && targetBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.MINE){
return;
}
// targetBuilding.createFurniture(item.getItemBase().getUseID(), 0, msg.getFurnitureLoc(), Vector3f.ZERO, 0, player);
}
// dispatch = Dispatch.borrow(player, baseMsg);
// DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
int maxHP = (int) targetBuilding.getMaxHitPoints();
int repairCost = BuildingManager.GetRepairCost(targetBuilding);
int missingHealth = (int) BuildingManager.GetMissingHealth(targetBuilding);
if (!targetBuilding.transferGold(-repairCost,false))
return;
targetBuilding.modifyHealth(BuildingManager.GetMissingHealth(targetBuilding), null);
UpdateObjectMsg uom = new UpdateObjectMsg(targetBuilding,3);
dispatch = Dispatch.borrow(origin.getPlayerCharacter(), uom);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
RepairBuildingMsg rbm = new RepairBuildingMsg( targetBuilding.getObjectUUID(), maxHP, missingHealth, repairCost, targetBuilding.getStrongboxValue());
dispatch = Dispatch.borrow(origin.getPlayerCharacter(), rbm);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
}
return true;
}
}