Browse Source

Removed custom exception candy

combat-2
MagicBot 8 months ago
parent
commit
634f1478ce
  1. 1
      src/engine/db/handlers/dbEffectsResourceCostHandler.java
  2. 2
      src/engine/db/handlers/dbMineHandler.java
  3. 2
      src/engine/db/handlers/dbMobBaseHandler.java
  4. 2
      src/engine/db/handlers/dbNPCHandler.java
  5. 2
      src/engine/db/handlers/dbPetitionHandler.java
  6. 2
      src/engine/db/handlers/dbPlayerCharacterHandler.java
  7. 2
      src/engine/db/handlers/dbPowerHandler.java
  8. 2
      src/engine/db/handlers/dbRuneBaseEffectHandler.java
  9. 2
      src/engine/db/handlers/dbRunegateHandler.java
  10. 4
      src/engine/db/handlers/dbShrineHandler.java
  11. 2
      src/engine/db/handlers/dbSkillBaseHandler.java
  12. 2
      src/engine/db/handlers/dbVendorDialogHandler.java
  13. 2
      src/engine/db/handlers/dbZoneHandler.java
  14. 2
      src/engine/devcmd/cmds/GotoCmd.java
  15. 2
      src/engine/devcmd/cmds/GotoObj.java
  16. 2
      src/engine/devcmd/cmds/SetBuildingAltitudeCmd.java
  17. 2
      src/engine/devcmd/cmds/SetGuildCmd.java
  18. 2
      src/engine/devcmd/cmds/SetHealthCmd.java
  19. 2
      src/engine/devcmd/cmds/SetInvulCmd.java
  20. 2
      src/engine/devcmd/cmds/SetManaCmd.java
  21. 2
      src/engine/devcmd/cmds/SetNpcNameCmd.java
  22. 4
      src/engine/devcmd/cmds/SetOwnerCmd.java
  23. 2
      src/engine/devcmd/cmds/SetPromotionClassCmd.java
  24. 13
      src/engine/devcmd/cmds/SetRaceCmd.java
  25. 2
      src/engine/devcmd/cmds/SetStaminaCmd.java
  26. 2
      src/engine/devcmd/cmds/SetSubRaceCmd.java
  27. 2
      src/engine/devcmd/cmds/ShowOffsetCmd.java
  28. 2
      src/engine/devcmd/cmds/SlotTestCmd.java
  29. 2
      src/engine/devcmd/cmds/SplatMobCmd.java
  30. 2
      src/engine/devcmd/cmds/UnloadFurnitureCmd.java
  31. 31
      src/engine/exception/SerializationException.java
  32. 9
      src/engine/gameManager/CombatManager.java
  33. 2
      src/engine/gameManager/DbManager.java
  34. 2
      src/engine/gameManager/ItemManager.java
  35. 2
      src/engine/gameManager/ZoneManager.java
  36. 4
      src/engine/jobs/FinishSummonsJob.java
  37. 2
      src/engine/jobs/UpgradeNPCJob.java
  38. 6
      src/engine/mbEnums.java
  39. 3
      src/engine/net/AbstractNetMsg.java
  40. 2
      src/engine/net/client/handlers/ObjectActionMsgHandler.java
  41. 2
      src/engine/net/client/handlers/RequestEnterWorldHandler.java
  42. 2
      src/engine/net/client/handlers/RequestGuildListHandler.java
  43. 2
      src/engine/net/client/handlers/RespawnMsgHandler.java
  44. 2
      src/engine/net/client/handlers/SetCombatModeMsgHandler.java
  45. 2
      src/engine/net/client/handlers/ShowMsgHandler.java
  46. 2
      src/engine/net/client/handlers/SocialMsgHandler.java
  47. 3
      src/engine/net/client/msg/AbandonAssetMsg.java
  48. 4
      src/engine/net/client/msg/AcceptTradeRequestMsg.java
  49. 4
      src/engine/net/client/msg/AddGoldToTradeWindowMsg.java
  50. 4
      src/engine/net/client/msg/AddItemToTradeWindowMsg.java
  51. 3
      src/engine/net/client/msg/AllianceChangeMsg.java
  52. 3
      src/engine/net/client/msg/AllyEnemyListMsg.java
  53. 3
      src/engine/net/client/msg/ArcMineChangeProductionMsg.java
  54. 3
      src/engine/net/client/msg/ArcMineWindowAvailableTimeMsg.java
  55. 3
      src/engine/net/client/msg/ArcMineWindowChangeMsg.java
  56. 3
      src/engine/net/client/msg/ArcOwnedMinesListMsg.java
  57. 3
      src/engine/net/client/msg/ArcSiegeSpireMsg.java
  58. 3
      src/engine/net/client/msg/ArcViewAssetTransactionsMsg.java
  59. 3
      src/engine/net/client/msg/AssetSupportMsg.java
  60. 3
      src/engine/net/client/msg/ChangeGuildLeaderMsg.java
  61. 3
      src/engine/net/client/msg/CityAssetMsg.java
  62. 3
      src/engine/net/client/msg/ClaimAssetMsg.java
  63. 3
      src/engine/net/client/msg/ClientNetMsg.java
  64. 4
      src/engine/net/client/msg/CloseTradeWindowMsg.java
  65. 4
      src/engine/net/client/msg/CommitToTradeMsg.java
  66. 3
      src/engine/net/client/msg/CostOpenBankMsg.java
  67. 3
      src/engine/net/client/msg/DeleteItemMsg.java
  68. 3
      src/engine/net/client/msg/DestroyBuildingMsg.java
  69. 3
      src/engine/net/client/msg/FurnitureMsg.java
  70. 4
      src/engine/net/client/msg/GoldFromVaultMsg.java
  71. 4
      src/engine/net/client/msg/GoldToVaultMsg.java
  72. 4
      src/engine/net/client/msg/InvalidTradeRequestMsg.java
  73. 4
      src/engine/net/client/msg/ItemFromVaultMsg.java
  74. 4
      src/engine/net/client/msg/ItemToVaultMsg.java
  75. 3
      src/engine/net/client/msg/LeaderboardMessage.java
  76. 3
      src/engine/net/client/msg/LoadCharacterMsg.java
  77. 3
      src/engine/net/client/msg/MinionTrainingMessage.java
  78. 4
      src/engine/net/client/msg/ModifyCommitToTradeMsg.java
  79. 4
      src/engine/net/client/msg/ObjectActionMsg.java
  80. 4
      src/engine/net/client/msg/OpenTradeWindowMsg.java
  81. 4
      src/engine/net/client/msg/OpenVaultMsg.java
  82. 3
      src/engine/net/client/msg/PowerProjectileMsg.java
  83. 3
      src/engine/net/client/msg/RecommendNationMsg.java
  84. 4
      src/engine/net/client/msg/RejectTradeRequestMsg.java
  85. 3
      src/engine/net/client/msg/RepairBuildingMsg.java
  86. 4
      src/engine/net/client/msg/RepairMsg.java
  87. 3
      src/engine/net/client/msg/ReqBankInventoryMsg.java
  88. 3
      src/engine/net/client/msg/SendOwnPlayerMsg.java
  89. 3
      src/engine/net/client/msg/SetObjectValueMsg.java
  90. 3
      src/engine/net/client/msg/ShowBankInventoryMsg.java
  91. 4
      src/engine/net/client/msg/ShowVaultInventoryMsg.java
  92. 3
      src/engine/net/client/msg/TaxCityMsg.java
  93. 3
      src/engine/net/client/msg/TaxResourcesMsg.java
  94. 3
      src/engine/net/client/msg/TerritoryChangeMessage.java
  95. 4
      src/engine/net/client/msg/TradeRequestMsg.java
  96. 3
      src/engine/net/client/msg/TransferAssetMsg.java
  97. 3
      src/engine/net/client/msg/TransferBuildingMsg.java
  98. 4
      src/engine/net/client/msg/TransferGoldToFromBuildingMsg.java
  99. 4
      src/engine/net/client/msg/TransferItemFromBankMsg.java
  100. 3
      src/engine/net/client/msg/TransferItemFromEquipToInventoryMsg.java
  101. Some files were not shown because too many files have changed in this diff Show More

1
src/engine/db/handlers/dbEffectsResourceCostHandler.java

@ -20,7 +20,6 @@ import java.sql.Connection; @@ -20,7 +20,6 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
public class dbEffectsResourceCostHandler extends dbHandlerBase {

2
src/engine/db/handlers/dbMineHandler.java

@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
package engine.db.handlers;
import engine.mbEnums;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.objects.Mine;
import engine.objects.MineProduction;
import org.pmw.tinylog.Logger;

2
src/engine/db/handlers/dbMobBaseHandler.java

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
package engine.db.handlers;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.gameManager.DbManager;
import engine.objects.MobBase;
import engine.objects.MobBaseEffects;
import engine.objects.MobBaseStats;

2
src/engine/db/handlers/dbNPCHandler.java

@ -309,6 +309,7 @@ public class dbNPCHandler extends dbHandlerBase { @@ -309,6 +309,7 @@ public class dbNPCHandler extends dbHandlerBase {
return false;
}
}
public boolean UPDATE_RACE(NPC npc, int value) {
try (Connection connection = DbManager.getConnection();
@ -324,6 +325,7 @@ public class dbNPCHandler extends dbHandlerBase { @@ -324,6 +325,7 @@ public class dbNPCHandler extends dbHandlerBase {
return false;
}
}
public void LOAD_PIRATE_NAMES() {
String pirateName;

2
src/engine/db/handlers/dbPetitionHandler.java

@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
package engine.db.handlers;
import engine.mbEnums;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.objects.Petition;
import org.pmw.tinylog.Logger;

2
src/engine/db/handlers/dbPlayerCharacterHandler.java

@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
package engine.db.handlers;
import engine.mbEnums;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.objects.AbstractWorldObject;
import engine.objects.Heraldry;
import engine.objects.PlayerCharacter;

2
src/engine/db/handlers/dbPowerHandler.java

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
package engine.db.handlers;
import engine.mbEnums;
import engine.gameManager.DbManager;
import engine.gameManager.PowersManager;
import engine.mbEnums;
import engine.objects.Mob;
import engine.powers.EffectsBase;
import org.pmw.tinylog.Logger;

2
src/engine/db/handlers/dbRuneBaseEffectHandler.java

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
package engine.db.handlers;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.gameManager.DbManager;
import engine.objects.AbstractGameObject;
import engine.objects.RuneBaseEffect;
import org.pmw.tinylog.Logger;

2
src/engine/db/handlers/dbRunegateHandler.java

@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
package engine.db.handlers;
import engine.mbEnums;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.objects.Building;
import engine.objects.Portal;
import org.pmw.tinylog.Logger;

4
src/engine/db/handlers/dbShrineHandler.java

@ -9,10 +9,10 @@ @@ -9,10 +9,10 @@
package engine.db.handlers;
import engine.mbEnums;
import engine.mbEnums.ProtectionState;
import engine.gameManager.DbManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.ProtectionState;
import engine.objects.AbstractGameObject;
import engine.objects.Building;
import engine.objects.Shrine;

2
src/engine/db/handlers/dbSkillBaseHandler.java

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
package engine.db.handlers;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.gameManager.DbManager;
import engine.objects.MaxSkills;
import engine.objects.SkillsBase;
import org.pmw.tinylog.Logger;

2
src/engine/db/handlers/dbVendorDialogHandler.java

@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
package engine.db.handlers;
import engine.mbEnums;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.objects.VendorDialog;
import org.pmw.tinylog.Logger;

2
src/engine/db/handlers/dbZoneHandler.java

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
package engine.db.handlers;
import engine.mbEnums;
import engine.gameManager.DbManager;
import engine.gameManager.ZoneManager;
import engine.mbEnums;
import engine.objects.Zone;
import engine.objects.ZoneTemplate;
import org.pmw.tinylog.Logger;

2
src/engine/devcmd/cmds/GotoCmd.java

@ -9,11 +9,11 @@ @@ -9,11 +9,11 @@
package engine.devcmd.cmds;
import engine.mbEnums.GameObjectType;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.DbManager;
import engine.gameManager.SessionManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums.GameObjectType;
import engine.objects.*;
import engine.server.MBServerStatics;

2
src/engine/devcmd/cmds/GotoObj.java

@ -9,10 +9,10 @@ @@ -9,10 +9,10 @@
package engine.devcmd.cmds;
import engine.mbEnums;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.DbManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.objects.*;
public class GotoObj extends AbstractDevCmd {

2
src/engine/devcmd/cmds/SetBuildingAltitudeCmd.java

@ -9,12 +9,12 @@ @@ -9,12 +9,12 @@
package engine.devcmd.cmds;
import engine.mbEnums.GameObjectType;
import engine.InterestManagement.WorldGrid;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums.GameObjectType;
import engine.objects.AbstractGameObject;
import engine.objects.Building;
import engine.objects.PlayerCharacter;

2
src/engine/devcmd/cmds/SetGuildCmd.java

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package engine.devcmd.cmds;
import engine.mbEnums.GameObjectType;
import engine.InterestManagement.WorldGrid;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.DbManager;
import engine.mbEnums.GameObjectType;
import engine.objects.AbstractGameObject;
import engine.objects.Guild;
import engine.objects.NPC;

2
src/engine/devcmd/cmds/SetHealthCmd.java

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
package engine.devcmd.cmds;
import engine.mbEnums.DispatchChannel;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.DispatchManager;
import engine.mbEnums.DispatchChannel;
import engine.net.client.msg.TargetedActionMsg;
import engine.objects.AbstractGameObject;
import engine.objects.PlayerCharacter;

2
src/engine/devcmd/cmds/SetInvulCmd.java

@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
package engine.devcmd.cmds;
import engine.devcmd.AbstractDevCmd;
import engine.mbEnums;
import engine.mbEnums.ProtectionState;
import engine.devcmd.AbstractDevCmd;
import engine.objects.AbstractGameObject;
import engine.objects.Building;
import engine.objects.City;

2
src/engine/devcmd/cmds/SetManaCmd.java

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package engine.devcmd.cmds;
import engine.devcmd.AbstractDevCmd;
import engine.mbEnums;
import engine.gameManager.DispatchManager;
import engine.mbEnums;
import engine.net.client.msg.TargetedActionMsg;
import engine.objects.AbstractGameObject;
import engine.objects.PlayerCharacter;

2
src/engine/devcmd/cmds/SetNpcNameCmd.java

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
package engine.devcmd.cmds;
import engine.mbEnums.GameObjectType;
import engine.InterestManagement.WorldGrid;
import engine.devcmd.AbstractDevCmd;
import engine.mbEnums.GameObjectType;
import engine.objects.AbstractGameObject;
import engine.objects.NPC;
import engine.objects.PlayerCharacter;

4
src/engine/devcmd/cmds/SetOwnerCmd.java

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
package engine.devcmd.cmds;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.mbEnums.DbObjectType;
import engine.mbEnums.GameObjectType;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.DbManager;
import engine.objects.*;

2
src/engine/devcmd/cmds/SetPromotionClassCmd.java

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
package engine.devcmd.cmds;
import engine.mbEnums.DispatchChannel;
import engine.InterestManagement.InterestManager;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager;
import engine.mbEnums.DispatchChannel;
import engine.net.client.msg.ApplyRuneMsg;
import engine.objects.AbstractGameObject;
import engine.objects.PlayerCharacter;

13
src/engine/devcmd/cmds/SetRaceCmd.java

@ -10,13 +10,12 @@ @@ -10,13 +10,12 @@
package engine.devcmd.cmds;
import engine.InterestManagement.InterestManager;
import engine.InterestManagement.WorldGrid;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.BuildingManager;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.objects.*;
import engine.objects.AbstractGameObject;
import engine.objects.NPC;
import engine.objects.PlayerCharacter;
public class SetRaceCmd extends AbstractDevCmd {
@ -30,13 +29,13 @@ public class SetRaceCmd extends AbstractDevCmd { @@ -30,13 +29,13 @@ public class SetRaceCmd extends AbstractDevCmd {
int newRace = Integer.parseInt(words[0]);
if(target.getObjectType().equals(mbEnums.GameObjectType.NPC) == false){
if (target.getObjectType().equals(mbEnums.GameObjectType.NPC) == false) {
throwbackError(player, "You Must Target An NPC");
}
NPC npc = (NPC)target;
NPC npc = (NPC) target;
npc.loadID = newRace;
DbManager.NPCQueries.UPDATE_RACE(npc,newRace);
DbManager.NPCQueries.UPDATE_RACE(npc, newRace);
InterestManager.reloadCharacter(npc);
}

2
src/engine/devcmd/cmds/SetStaminaCmd.java

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
package engine.devcmd.cmds;
import engine.mbEnums.DispatchChannel;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.DispatchManager;
import engine.mbEnums.DispatchChannel;
import engine.net.client.msg.TargetedActionMsg;
import engine.objects.AbstractGameObject;
import engine.objects.PlayerCharacter;

2
src/engine/devcmd/cmds/SetSubRaceCmd.java

@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
package engine.devcmd.cmds;
import engine.mbEnums.GameObjectType;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.DispatchManager;
import engine.mbEnums.GameObjectType;
import engine.net.client.msg.ApplyBuildingEffectMsg;
import engine.net.client.msg.UpdateCharOrMobMessage;
import engine.objects.*;

2
src/engine/devcmd/cmds/ShowOffsetCmd.java

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package engine.devcmd.cmds;
import engine.mbEnums.GameObjectType;
import engine.devcmd.AbstractDevCmd;
import engine.math.Vector3fImmutable;
import engine.mbEnums.GameObjectType;
import engine.objects.AbstractGameObject;
import engine.objects.Building;
import engine.objects.PlayerCharacter;

2
src/engine/devcmd/cmds/SlotTestCmd.java

@ -9,11 +9,11 @@ @@ -9,11 +9,11 @@
package engine.devcmd.cmds;
import engine.mbEnums.GameObjectType;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.BuildingManager;
import engine.gameManager.ChatManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums.GameObjectType;
import engine.objects.*;
import java.util.ArrayList;

2
src/engine/devcmd/cmds/SplatMobCmd.java

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package engine.devcmd.cmds;
import engine.mbEnums;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.objects.AbstractGameObject;
import engine.objects.Mob;
import engine.objects.PlayerCharacter;

2
src/engine/devcmd/cmds/UnloadFurnitureCmd.java

@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
package engine.devcmd.cmds;
import engine.mbEnums.GameObjectType;
import engine.devcmd.AbstractDevCmd;
import engine.mbEnums.GameObjectType;
import engine.net.client.msg.LoadStructureMsg;
import engine.net.client.msg.MoveToPointMsg;
import engine.net.client.msg.UnloadObjectsMsg;

31
src/engine/exception/SerializationException.java

@ -1,31 +0,0 @@ @@ -1,31 +0,0 @@
// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ .
// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀
// Magicbane Emulator Project © 2013 - 2022
// www.magicbane.com
package engine.exception;
public class SerializationException extends MBServerException {
private static final long serialVersionUID = 6927044139998382254L;
public SerializationException() {
super();
}
public SerializationException(String arg0, Throwable arg1) {
super(arg0, arg1);
}
public SerializationException(String arg0) {
super(arg0);
}
public SerializationException(Throwable arg0) {
super(arg0);
}
}

9
src/engine/gameManager/CombatManager.java

@ -113,7 +113,7 @@ public enum CombatManager { @@ -113,7 +113,7 @@ public enum CombatManager {
public static void processAttack(AbstractCharacter attacker, AbstractWorldObject target, mbEnums.EquipSlotType slot) {
if(attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
if (!attacker.isCombat())
return;
@ -207,7 +207,6 @@ public enum CombatManager { @@ -207,7 +207,6 @@ public enum CombatManager {
}
//check if Out of Stamina
if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
if (attacker.getStamina() < (weapon.template.item_wt / 3f)) {
@ -411,10 +410,10 @@ public enum CombatManager { @@ -411,10 +410,10 @@ public enum CombatManager {
int attackAnim = getSwingAnimation(null, null, slot.equals(mbEnums.EquipSlotType.RHELD));
if (attacker.charItemManager.getEquipped().get(slot) != null) {
if(attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
DeferredPowerJob weaponPower = ((PlayerCharacter) attacker).getWeaponPower();
attackAnim = getSwingAnimation(attacker.charItemManager.getEquipped().get(slot).template, weaponPower, slot.equals(mbEnums.EquipSlotType.RHELD));
}else {
} else {
attackAnim = getSwingAnimation(attacker.charItemManager.getEquipped().get(slot).template, null, slot.equals(mbEnums.EquipSlotType.RHELD));
}
}
@ -513,7 +512,7 @@ public enum CombatManager { @@ -513,7 +512,7 @@ public enum CombatManager {
int random = ThreadLocalRandom.current().nextInt(wb.weapon_attack_anim_right.size());
int anim = wb.weapon_attack_anim_right.get(random)[0];
return anim;
}else {
} else {
int random = ThreadLocalRandom.current().nextInt(wb.weapon_attack_anim_left.size());
return wb.weapon_attack_anim_left.get(random)[0];
}

2
src/engine/gameManager/DbManager.java

@ -10,9 +10,9 @@ package engine.gameManager; @@ -10,9 +10,9 @@ package engine.gameManager;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import engine.db.handlers.*;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.db.handlers.*;
import engine.objects.*;
import engine.server.MBServerStatics;
import engine.util.Hasher;

2
src/engine/gameManager/ItemManager.java

@ -192,7 +192,7 @@ public enum ItemManager { @@ -192,7 +192,7 @@ public enum ItemManager {
if (!ValidRace(item, abstractCharacter.absRace))
return false;
if (!ValidClass(item, abstractCharacter.absBaseClass,abstractCharacter.absPromotionClass))
if (!ValidClass(item, abstractCharacter.absBaseClass, abstractCharacter.absPromotionClass))
return false;
//players can't wear 0 value items.

2
src/engine/gameManager/ZoneManager.java

@ -8,12 +8,12 @@ @@ -8,12 +8,12 @@
package engine.gameManager;
import engine.mbEnums;
import engine.InterestManagement.Terrain;
import engine.math.Bounds;
import engine.math.Vector2f;
import engine.math.Vector3f;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.objects.Building;
import engine.objects.City;
import engine.objects.Zone;

4
src/engine/jobs/FinishSummonsJob.java

@ -9,11 +9,11 @@ @@ -9,11 +9,11 @@
package engine.jobs;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.gameManager.PowersManager;
import engine.job.AbstractScheduleJob;
import engine.job.JobContainer;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.net.client.msg.ErrorPopupMsg;
import engine.objects.PlayerCharacter;

2
src/engine/jobs/UpgradeNPCJob.java

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
package engine.jobs;
import engine.mbEnums.GameObjectType;
import engine.InterestManagement.WorldGrid;
import engine.job.AbstractScheduleJob;
import engine.mbEnums.GameObjectType;
import engine.objects.AbstractCharacter;
import engine.objects.Mob;
import engine.objects.NPC;

6
src/engine/mbEnums.java

@ -2595,11 +2595,11 @@ public class mbEnums { @@ -2595,11 +2595,11 @@ public class mbEnums {
}
public boolean canJoin(AbstractCharacter character) {
if(this.requiredRaces.contains(character.absRace) == false)
if (this.requiredRaces.contains(character.absRace) == false)
return false;
if(this.requiredClasses.contains(character.absBaseClass) == false && this.requiredClasses.contains(character.absPromotionClass) == false)
if (this.requiredClasses.contains(character.absBaseClass) == false && this.requiredClasses.contains(character.absPromotionClass) == false)
return false;
if(this.sexRequired.contains(character.absGender) == false)
if (this.sexRequired.contains(character.absGender) == false)
return false;
return true;

3
src/engine/net/AbstractNetMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net;
import engine.exception.SerializationException;
import engine.server.MBServerStatics;
import engine.util.StringUtils;
import org.pmw.tinylog.Logger;
@ -95,7 +94,7 @@ public abstract class AbstractNetMsg { @@ -95,7 +94,7 @@ public abstract class AbstractNetMsg {
* @throws Exception
*/
protected abstract void _serialize(ByteBufferWriter writer)
throws SerializationException;
;
/**
* Attempts to serialize this NetMsg into a ByteBuffer. ByteBuffer is

2
src/engine/net/client/handlers/ObjectActionMsgHandler.java

@ -265,7 +265,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler { @@ -265,7 +265,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
player.cancelOnSpell();
break;
case RUNE:
ApplyRuneMsg.applyRune(uuid,origin,player);
ApplyRuneMsg.applyRune(uuid, origin, player);
itemMan.consume(item);
break;
default: //shouldn't be here, consume item

2
src/engine/net/client/handlers/RequestEnterWorldHandler.java

@ -6,12 +6,12 @@ import engine.db.archive.CharacterRecord; @@ -6,12 +6,12 @@ import engine.db.archive.CharacterRecord;
import engine.db.archive.DataWarehouse;
import engine.db.archive.PvpRecord;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.DispatchChannel;
import engine.net.Dispatch;
import engine.gameManager.DispatchManager;
import engine.net.client.ClientConnection;
import engine.net.client.msg.*;
import engine.objects.Account;

2
src/engine/net/client/handlers/RequestGuildListHandler.java

@ -11,10 +11,10 @@ package engine.net.client.handlers; @@ -11,10 +11,10 @@ package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager;
import engine.mbEnums;
import engine.net.Dispatch;
import engine.gameManager.DispatchManager;
import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.ErrorPopupMsg;

2
src/engine/net/client/handlers/RespawnMsgHandler.java

@ -9,12 +9,12 @@ @@ -9,12 +9,12 @@
package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager;
import engine.gameManager.MovementManager;
import engine.job.JobScheduler;
import engine.jobs.RefreshGroupJob;
import engine.mbEnums.DispatchChannel;
import engine.net.Dispatch;
import engine.gameManager.DispatchManager;
import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.MoveToPointMsg;

2
src/engine/net/client/handlers/SetCombatModeMsgHandler.java

@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.mbEnums;
import engine.gameManager.DispatchManager;
import engine.mbEnums;
import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.SetCombatModeMsg;

2
src/engine/net/client/handlers/ShowMsgHandler.java

@ -9,10 +9,10 @@ @@ -9,10 +9,10 @@
package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager;
import engine.mbEnums;
import engine.mbEnums.DispatchChannel;
import engine.net.Dispatch;
import engine.gameManager.DispatchManager;
import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.ShowMsg;

2
src/engine/net/client/handlers/SocialMsgHandler.java

@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.mbEnums.DispatchChannel;
import engine.gameManager.DispatchManager;
import engine.mbEnums.DispatchChannel;
import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.SocialMsg;

3
src/engine/net/client/msg/AbandonAssetMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -46,7 +45,7 @@ public class AbandonAssetMsg extends ClientNetMsg { @@ -46,7 +45,7 @@ public class AbandonAssetMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.pad);
writer.putInt(this.objectType);
writer.putInt(this.objectUUID);

4
src/engine/net/client/msg/AcceptTradeRequestMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -70,8 +69,7 @@ public class AcceptTradeRequestMsg extends ClientNetMsg { @@ -70,8 +69,7 @@ public class AcceptTradeRequestMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(unknown01);
writer.putInt(playerType);
writer.putInt(playerID);

4
src/engine/net/client/msg/AddGoldToTradeWindowMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -57,8 +56,7 @@ public class AddGoldToTradeWindowMsg extends ClientNetMsg { @@ -57,8 +56,7 @@ public class AddGoldToTradeWindowMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(unknown01);
writer.putLong(playerCompID);
writer.putInt(amount);

4
src/engine/net/client/msg/AddItemToTradeWindowMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -64,8 +63,7 @@ public class AddItemToTradeWindowMsg extends ClientNetMsg { @@ -64,8 +63,7 @@ public class AddItemToTradeWindowMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(unknown01);
writer.putInt(playerType);
writer.putInt(playerID);

3
src/engine/net/client/msg/AllianceChangeMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.mbEnums.GameObjectType;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
@ -97,7 +96,7 @@ public class AllianceChangeMsg extends ClientNetMsg { @@ -97,7 +96,7 @@ public class AllianceChangeMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.put(this.msgType);
if (this.msgType == ERROR_TO0_EARLY)
writer.putInt(this.secondsToWait);

3
src/engine/net/client/msg/AllyEnemyListMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.mbEnums.GameObjectType;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
@ -67,7 +66,7 @@ public class AllyEnemyListMsg extends ClientNetMsg { @@ -67,7 +66,7 @@ public class AllyEnemyListMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(GameObjectType.Guild.ordinal());
writer.putInt(this.guildID);

3
src/engine/net/client/msg/ArcMineChangeProductionMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -44,7 +43,7 @@ public class ArcMineChangeProductionMsg extends ClientNetMsg { @@ -44,7 +43,7 @@ public class ArcMineChangeProductionMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.mineID);
writer.putInt(this.resourceHash);
}

3
src/engine/net/client/msg/ArcMineWindowAvailableTimeMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -88,7 +87,7 @@ public class ArcMineWindowAvailableTimeMsg extends ClientNetMsg { @@ -88,7 +87,7 @@ public class ArcMineWindowAvailableTimeMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(MBServerStatics.MINE_EARLY_WINDOW); //15);
writer.putInt(late);

3
src/engine/net/client/msg/ArcMineWindowChangeMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -46,7 +45,7 @@ public class ArcMineWindowChangeMsg extends ClientNetMsg { @@ -46,7 +45,7 @@ public class ArcMineWindowChangeMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.time);
writer.putInt(this.buildingType);
writer.putInt(this.buildingID);

3
src/engine/net/client/msg/ArcOwnedMinesListMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -45,7 +44,7 @@ public class ArcOwnedMinesListMsg extends ClientNetMsg { @@ -45,7 +44,7 @@ public class ArcOwnedMinesListMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(mineList.size());
for (Mine mine : mineList) {
mine.serializeForMineProduction(writer);

3
src/engine/net/client/msg/ArcSiegeSpireMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -48,7 +47,7 @@ public class ArcSiegeSpireMsg extends ClientNetMsg { @@ -48,7 +47,7 @@ public class ArcSiegeSpireMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
}

3
src/engine/net/client/msg/ArcViewAssetTransactionsMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.gameManager.BuildingManager;
import engine.mbEnums.GameObjectType;
import engine.mbEnums.TransactionType;
@ -75,7 +74,7 @@ public class ArcViewAssetTransactionsMsg extends ClientNetMsg { @@ -75,7 +74,7 @@ public class ArcViewAssetTransactionsMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.transactionID);
writer.putInt(this.warehouse.building.getObjectUUID());

3
src/engine/net/client/msg/AssetSupportMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.mbEnums;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
@ -152,7 +151,7 @@ public class AssetSupportMsg extends ClientNetMsg { @@ -152,7 +151,7 @@ public class AssetSupportMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.messageType);
this.supportMsgType = mbEnums.SupportMsgType.typeLookup.get(this.messageType);

3
src/engine/net/client/msg/ChangeGuildLeaderMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.mbEnums.GameObjectType;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
@ -50,7 +49,7 @@ public class ChangeGuildLeaderMsg extends ClientNetMsg { @@ -50,7 +49,7 @@ public class ChangeGuildLeaderMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(0);
writer.putInt(0);
writer.putInt(0);

3
src/engine/net/client/msg/CityAssetMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.gameManager.BuildingManager;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
@ -141,7 +140,7 @@ public class CityAssetMsg extends ClientNetMsg { @@ -141,7 +140,7 @@ public class CityAssetMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
String buildingName;

3
src/engine/net/client/msg/ClaimAssetMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -53,7 +52,7 @@ public class ClaimAssetMsg extends ClientNetMsg { @@ -53,7 +52,7 @@ public class ClaimAssetMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.pad);
writer.putInt(this.objectType);
writer.putInt(this.objectUUID);

3
src/engine/net/client/msg/ClientNetMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.*;
public abstract class ClientNetMsg extends AbstractNetMsg {
@ -49,7 +48,7 @@ public abstract class ClientNetMsg extends AbstractNetMsg { @@ -49,7 +48,7 @@ public abstract class ClientNetMsg extends AbstractNetMsg {
*/
@Override
protected abstract void _serialize(ByteBufferWriter writer)
throws SerializationException;
;
/*
* return the header size of 4 for ClientMsgs

4
src/engine/net/client/msg/CloseTradeWindowMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -59,8 +58,7 @@ public class CloseTradeWindowMsg extends ClientNetMsg { @@ -59,8 +58,7 @@ public class CloseTradeWindowMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(playerType);
writer.putInt(playerID);

4
src/engine/net/client/msg/CommitToTradeMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -56,8 +55,7 @@ public class CommitToTradeMsg extends ClientNetMsg { @@ -56,8 +55,7 @@ public class CommitToTradeMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(unknown01);
writer.putLong(playerCompID);
}

3
src/engine/net/client/msg/CostOpenBankMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -65,7 +64,7 @@ public class CostOpenBankMsg extends ClientNetMsg { @@ -65,7 +64,7 @@ public class CostOpenBankMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(playerType);
writer.putInt(playerID);
writer.putLong(unknown01);

3
src/engine/net/client/msg/DeleteItemMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -55,7 +54,7 @@ public class DeleteItemMsg extends ClientNetMsg { @@ -55,7 +54,7 @@ public class DeleteItemMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.type);
writer.putInt(this.objectUUID);
writer.putInt(this.unknown1);

3
src/engine/net/client/msg/DestroyBuildingMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -46,7 +45,7 @@ public class DestroyBuildingMsg extends ClientNetMsg { @@ -46,7 +45,7 @@ public class DestroyBuildingMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.pad);
writer.putInt(this.objectType);
writer.putInt(this.objectUUID);

3
src/engine/net/client/msg/FurnitureMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.math.Vector3fImmutable;
import engine.mbEnums.GameObjectType;
import engine.net.AbstractConnection;
@ -89,7 +88,7 @@ public class FurnitureMsg extends ClientNetMsg { @@ -89,7 +88,7 @@ public class FurnitureMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
if (this.type == 3 || this.type == 4) {
writer.putInt(this.type);
writer.putInt(GameObjectType.Building.ordinal());

4
src/engine/net/client/msg/GoldFromVaultMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -63,8 +62,7 @@ public class GoldFromVaultMsg extends ClientNetMsg { @@ -63,8 +62,7 @@ public class GoldFromVaultMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putLong(unknown01);
writer.putLong(playerCompID);
writer.putLong(accountCompID);

4
src/engine/net/client/msg/GoldToVaultMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.mbEnums.GameObjectType;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
@ -74,8 +73,7 @@ public class GoldToVaultMsg extends ClientNetMsg { @@ -74,8 +73,7 @@ public class GoldToVaultMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(GameObjectType.PlayerCharacter.ordinal());
writer.putInt(this.playerID);
writer.putInt(GameObjectType.Account.ordinal());

4
src/engine/net/client/msg/InvalidTradeRequestMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -66,8 +65,7 @@ public class InvalidTradeRequestMsg extends ClientNetMsg { @@ -66,8 +65,7 @@ public class InvalidTradeRequestMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(unknown01);
writer.putInt(busyType);
writer.putInt(busyID);

4
src/engine/net/client/msg/ItemFromVaultMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -94,8 +93,7 @@ public class ItemFromVaultMsg extends ClientNetMsg { @@ -94,8 +93,7 @@ public class ItemFromVaultMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(unknown01);
writer.putInt(unknown02);
writer.putLong(playerCompID);

4
src/engine/net/client/msg/ItemToVaultMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -95,8 +94,7 @@ public class ItemToVaultMsg extends ClientNetMsg { @@ -95,8 +94,7 @@ public class ItemToVaultMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putLong(playerCompID);
writer.putInt(unknown01);
writer.putInt(unknown02);

3
src/engine/net/client/msg/LeaderboardMessage.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.gameManager.BuildingManager;
import engine.mbEnums.ShrineType;
import engine.net.AbstractConnection;
@ -49,7 +48,7 @@ public class LeaderboardMessage extends ClientNetMsg { @@ -49,7 +48,7 @@ public class LeaderboardMessage extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(ShrineType.values().length);//??

3
src/engine/net/client/msg/LoadCharacterMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.*;
import engine.objects.AbstractCharacter;
import engine.objects.Corpse;
@ -63,7 +62,7 @@ public class LoadCharacterMsg extends ClientNetMsg { @@ -63,7 +62,7 @@ public class LoadCharacterMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
if (absChar != null) {

3
src/engine/net/client/msg/MinionTrainingMessage.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -85,7 +84,7 @@ public class MinionTrainingMessage extends ClientNetMsg { @@ -85,7 +84,7 @@ public class MinionTrainingMessage extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
}

4
src/engine/net/client/msg/ModifyCommitToTradeMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -68,8 +67,7 @@ public class ModifyCommitToTradeMsg extends ClientNetMsg { @@ -68,8 +67,7 @@ public class ModifyCommitToTradeMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(playerType);
writer.putInt(playerID);
writer.putInt(targetType);

4
src/engine/net/client/msg/ObjectActionMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -64,8 +63,7 @@ public class ObjectActionMsg extends ClientNetMsg { @@ -64,8 +63,7 @@ public class ObjectActionMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(unknown01);
writer.putInt(unknown02);
for (int i = 0; i < unknown01; i++)

4
src/engine/net/client/msg/OpenTradeWindowMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -65,8 +64,7 @@ public class OpenTradeWindowMsg extends ClientNetMsg { @@ -65,8 +64,7 @@ public class OpenTradeWindowMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(unknown01);
writer.putInt(playerType);
writer.putInt(playerID);

4
src/engine/net/client/msg/OpenVaultMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -66,8 +65,7 @@ public class OpenVaultMsg extends ClientNetMsg { @@ -66,8 +65,7 @@ public class OpenVaultMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(playerType);
writer.putInt(playerID);
writer.putInt(npcType);

3
src/engine/net/client/msg/PowerProjectileMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -68,7 +67,7 @@ public class PowerProjectileMsg extends ClientNetMsg { @@ -68,7 +67,7 @@ public class PowerProjectileMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
engine.math.Vector3fImmutable faceDir = this.source.getLoc().subtract2D(target.getLoc()).normalize();
engine.math.Vector3fImmutable newLoc = faceDir.scaleAdd(range, target.getLoc());

3
src/engine/net/client/msg/RecommendNationMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.mbEnums.GameObjectType;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
@ -67,7 +66,7 @@ public class RecommendNationMsg extends ClientNetMsg { @@ -67,7 +66,7 @@ public class RecommendNationMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(GameObjectType.Guild.ordinal());
writer.putInt(guildID);
writer.put(this.ally);

4
src/engine/net/client/msg/RejectTradeRequestMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -59,8 +58,7 @@ public class RejectTradeRequestMsg extends ClientNetMsg { @@ -59,8 +58,7 @@ public class RejectTradeRequestMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(unknown01);
writer.putLong(playerCompID);
writer.putLong(targetCompID);

3
src/engine/net/client/msg/RepairBuildingMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.mbEnums.GameObjectType;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
@ -77,7 +76,7 @@ public class RepairBuildingMsg extends ClientNetMsg { @@ -77,7 +76,7 @@ public class RepairBuildingMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(0);
writer.putInt(GameObjectType.Building.ordinal());
writer.putInt(this.buildingID);

4
src/engine/net/client/msg/RepairMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -108,8 +107,7 @@ public class RepairMsg extends ClientNetMsg { @@ -108,8 +107,7 @@ public class RepairMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.msgType);
writer.putInt(0);
writer.putInt(this.unknown01);

3
src/engine/net/client/msg/ReqBankInventoryMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -62,7 +61,7 @@ public class ReqBankInventoryMsg extends ClientNetMsg { @@ -62,7 +61,7 @@ public class ReqBankInventoryMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(playerType);
writer.putInt(playerID);
writer.putLong(unknown01);

3
src/engine/net/client/msg/SendOwnPlayerMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.*;
import engine.objects.Building;
import engine.objects.PlayerCharacter;
@ -87,7 +86,7 @@ public class SendOwnPlayerMsg extends ClientNetMsg { @@ -87,7 +86,7 @@ public class SendOwnPlayerMsg extends ClientNetMsg {
writer.putVector3f(ch.getLoc());
try {
PlayerCharacter.serializeForClientMsgFull(this.ch, writer);
} catch (SerializationException e) {
} catch (Exception e) {
Logger.error(e);
}
}

3
src/engine/net/client/msg/SetObjectValueMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -61,7 +60,7 @@ public class SetObjectValueMsg extends ClientNetMsg { @@ -61,7 +60,7 @@ public class SetObjectValueMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.targetType);
writer.putInt(this.targetID);
writer.putInt(0);

3
src/engine/net/client/msg/ShowBankInventoryMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -55,7 +54,7 @@ public class ShowBankInventoryMsg extends ClientNetMsg { @@ -55,7 +54,7 @@ public class ShowBankInventoryMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
ArrayList<Item> bank = pc.charItemManager.getBank();

4
src/engine/net/client/msg/ShowVaultInventoryMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -58,8 +57,7 @@ public class ShowVaultInventoryMsg extends ClientNetMsg { @@ -58,8 +57,7 @@ public class ShowVaultInventoryMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(accountType);
writer.putInt(accountID);

3
src/engine/net/client/msg/TaxCityMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.gameManager.BuildingManager;
import engine.mbEnums.GameObjectType;
import engine.net.AbstractConnection;
@ -84,7 +83,7 @@ public class TaxCityMsg extends ClientNetMsg { @@ -84,7 +83,7 @@ public class TaxCityMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(0);
writer.putInt(GameObjectType.Building.ordinal());

3
src/engine/net/client/msg/TaxResourcesMsg.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.mbEnums.GameObjectType;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
@ -82,7 +81,7 @@ public class TaxResourcesMsg extends ClientNetMsg { @@ -82,7 +81,7 @@ public class TaxResourcesMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(0);
writer.putInt(GameObjectType.Building.ordinal());

3
src/engine/net/client/msg/TerritoryChangeMessage.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -59,7 +58,7 @@ public class TerritoryChangeMessage extends ClientNetMsg { @@ -59,7 +58,7 @@ public class TerritoryChangeMessage extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putString(realm.getRealmName());
if (this.realmOwner != null) {

4
src/engine/net/client/msg/TradeRequestMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -67,8 +66,7 @@ public class TradeRequestMsg extends ClientNetMsg { @@ -67,8 +66,7 @@ public class TradeRequestMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(unknown01);
writer.putInt(this.sourceType);
writer.putInt(this.sourceID);

3
src/engine/net/client/msg/TransferAssetMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -51,7 +50,7 @@ public class TransferAssetMsg extends ClientNetMsg { @@ -51,7 +50,7 @@ public class TransferAssetMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.pad);
writer.putInt(this.objectType);
writer.putInt(this.objectID);

3
src/engine/net/client/msg/TransferBuildingMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -50,7 +49,7 @@ public class TransferBuildingMsg extends ClientNetMsg { @@ -50,7 +49,7 @@ public class TransferBuildingMsg extends ClientNetMsg {
* Serializes the subclass specific items to the supplied NetMsgWriter.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.pad);
writer.putInt(this.objectType);
writer.putInt(this.objectID);

4
src/engine/net/client/msg/TransferGoldToFromBuildingMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -75,8 +74,7 @@ public class TransferGoldToFromBuildingMsg extends ClientNetMsg { @@ -75,8 +74,7 @@ public class TransferGoldToFromBuildingMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.direction);
writer.putInt(this.failReason);
writer.putInt(this.objectType);

4
src/engine/net/client/msg/TransferItemFromBankMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@ -99,8 +98,7 @@ public class TransferItemFromBankMsg extends ClientNetMsg { @@ -99,8 +98,7 @@ public class TransferItemFromBankMsg extends ClientNetMsg {
* Serializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer)
throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putLong(playerCompID1);
writer.putLong(playerCompID2);
writer.putInt(type);

3
src/engine/net/client/msg/TransferItemFromEquipToInventoryMsg.java

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.mbEnums;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
@ -58,7 +57,7 @@ public class TransferItemFromEquipToInventoryMsg extends ClientNetMsg { @@ -58,7 +57,7 @@ public class TransferItemFromEquipToInventoryMsg extends ClientNetMsg {
* Deserializes the subclass specific items from the supplied NetMsgReader.
*/
@Override
protected void _serialize(ByteBufferWriter writer) throws SerializationException {
protected void _serialize(ByteBufferWriter writer) {
writer.putInt(this.playerType);
writer.putInt(this.playerUUID);
writer.putInt(this.slot.ordinal());

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save