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

Removed custom exception candy

Browse Source
This commit is contained in:
MagicBot
2024-05-12 13:36:47 -04:00
parent 7335946c10
commit 634f1478ce
142 changed files with 181 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/AbstractCharacter.java
+3 -4
View File
@@ -12,7 +12,6 @@ package engine.objects;
import engine.InterestManagement.InterestManager;
import engine.InterestManagement.Terrain;
import engine.InterestManagement.WorldGrid;
import engine.exception.SerializationException;
import engine.gameManager.*;
import engine.job.AbstractJob;
import engine.job.JobContainer;
@@ -386,14 +385,14 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
return 5000;
}
public static void _serializeForClientMsg(AbstractCharacter abstractCharacter, final ByteBufferWriter writer) throws SerializationException {
public static void _serializeForClientMsg(AbstractCharacter abstractCharacter, final ByteBufferWriter writer) {
AbstractCharacter.__serializeForClientMsg(abstractCharacter, writer);
}
public static void __serializeForClientMsg(AbstractCharacter abstractCharacter, final ByteBufferWriter writer) throws SerializationException {
public static void __serializeForClientMsg(AbstractCharacter abstractCharacter, final ByteBufferWriter writer) {
}
public static void serializeForClientMsgOtherPlayer(AbstractCharacter abstractCharacter, final ByteBufferWriter writer, final boolean asciiLastName) throws SerializationException {
public static void serializeForClientMsgOtherPlayer(AbstractCharacter abstractCharacter, final ByteBufferWriter writer, final boolean asciiLastName) {
switch (abstractCharacter.getObjectType()) {
case PlayerCharacter:
src/engine/objects/Corpse.java
+2 -5
View File
@@ -10,7 +10,6 @@
package engine.objects;
import engine.InterestManagement.WorldGrid;
import engine.exception.SerializationException;
import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager;
@@ -139,12 +138,10 @@ public class Corpse extends AbstractWorldObject {
DbManager.removeFromCache(corpse);
}
public static void _serializeForClientMsg(Corpse corpse, ByteBufferWriter writer)
throws SerializationException {
public static void _serializeForClientMsg(Corpse corpse, ByteBufferWriter writer) {
}
public static void _serializeForClientMsg(Corpse corpse, ByteBufferWriter writer, boolean aln)
throws SerializationException {
public static void _serializeForClientMsg(Corpse corpse, ByteBufferWriter writer, boolean aln) {
Building building = null;
if (corpse.inBuildingID != 0)
src/engine/objects/Effect.java
+2 -2
View File
@@ -9,8 +9,6 @@
package engine.objects;
import engine.mbEnums;
import engine.mbEnums.EffectSourceType;
import engine.gameManager.PowersManager;
import engine.job.AbstractJob;
import engine.job.AbstractScheduleJob;
@@ -19,6 +17,8 @@ import engine.jobs.AbstractEffectJob;
import engine.jobs.DamageOverTimeJob;
import engine.jobs.NoTimeJob;
import engine.jobs.PersistentAoeJob;
import engine.mbEnums;
import engine.mbEnums.EffectSourceType;
import engine.net.ByteBufferWriter;
import engine.net.client.ClientConnection;
import engine.powers.ActionsBase;
src/engine/objects/Experience.java
+1 -1
View File
@@ -9,9 +9,9 @@
package engine.objects;
import engine.mbEnums.TargetColor;
import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums.TargetColor;
import engine.server.MBServerStatics;
import java.util.ArrayList;
src/engine/objects/GuildAlliances.java
+1 -1
View File
@@ -9,8 +9,8 @@
package engine.objects;
import engine.mbEnums.AllianceType;
import engine.gameManager.DbManager;
import engine.mbEnums.AllianceType;
import java.sql.ResultSet;
import java.sql.SQLException;
src/engine/objects/Item.java
+3 -5
View File
@@ -9,7 +9,6 @@
package engine.objects;
import engine.exception.SerializationException;
import engine.gameManager.ConfigManager;
import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager;
@@ -174,8 +173,7 @@ public class Item extends AbstractWorldObject {
}
public static void _serializeForClientMsg(Item item, ByteBufferWriter writer)
throws SerializationException {
public static void _serializeForClientMsg(Item item, ByteBufferWriter writer) {
Item._serializeForClientMsg(item, writer, true);
}
@@ -482,7 +480,7 @@ public class Item extends AbstractWorldObject {
Item.serializeForClientMsgForVendor(item, writer, vendor.getSellPercent());
} catch (SerializationException se) {
} catch (Exception se) {
continue;
}
++serialized;
@@ -516,7 +514,7 @@ public class Item extends AbstractWorldObject {
Item.serializeForClientMsgForVendor(item, writer, vendor.getSellPercent());
} catch (SerializationException se) {
} catch (Exception se) {
continue;
}
++serialized;
src/engine/objects/Mob.java
+2 -3
View File
@@ -10,7 +10,6 @@
package engine.objects;
import engine.InterestManagement.WorldGrid;
import engine.exception.SerializationException;
import engine.gameManager.*;
import engine.job.JobScheduler;
import engine.jobs.DeferredPowerJob;
@@ -157,11 +156,11 @@ public class Mob extends AbstractIntelligenceAgent implements Delayed {
}
public static void serializeMobForClientMsgOtherPlayer(Mob mob, ByteBufferWriter writer) throws SerializationException {
public static void serializeMobForClientMsgOtherPlayer(Mob mob, ByteBufferWriter writer) {
Mob.serializeForClientMsgOtherPlayer(mob, writer);
}
public static void serializeForClientMsgOtherPlayer(Mob mob, ByteBufferWriter writer) throws SerializationException {
public static void serializeForClientMsgOtherPlayer(Mob mob, ByteBufferWriter writer) {
writer.putInt(0);
writer.putInt(0);
src/engine/objects/NPC.java
+8 -11
View File
@@ -10,7 +10,6 @@
package engine.objects;
import engine.InterestManagement.WorldGrid;
import engine.exception.SerializationException;
import engine.gameManager.*;
import engine.job.JobContainer;
import engine.job.JobScheduler;
@@ -179,13 +178,11 @@ public class NPC extends AbstractCharacter {
}
public static void serializeNpcForClientMsgOtherPlayer(NPC npc, ByteBufferWriter writer, boolean hideAsciiLastName)
throws SerializationException {
public static void serializeNpcForClientMsgOtherPlayer(NPC npc, ByteBufferWriter writer, boolean hideAsciiLastName) {
serializeForClientMsgOtherPlayer(npc, writer);
}
public static void serializeForClientMsgOtherPlayer(NPC npc, ByteBufferWriter writer)
throws SerializationException {
public static void serializeForClientMsgOtherPlayer(NPC npc, ByteBufferWriter writer) {
writer.putInt(0);
writer.putInt(0);
@@ -914,13 +911,13 @@ public class NPC extends AbstractCharacter {
this.charItemManager.equipped = loadEquipmentSet(this.equipmentSetID);
// Create NPC bounds object
Bounds npcBounds = Bounds.borrow();
npcBounds.setBounds(this.getLoc());
// Create NPC bounds object
Bounds npcBounds = Bounds.borrow();
npcBounds.setBounds(this.getLoc());
//apply NPC rune effects
NPCManager.applyRunesForNPC(this);
this.resists.setImmuneToAll(true);
//apply NPC rune effects
NPCManager.applyRunesForNPC(this);
this.resists.setImmuneToAll(true);
}
src/engine/objects/PlayerCharacter.java
+7 -9
View File
@@ -17,7 +17,6 @@ import engine.db.archive.CharacterRecord;
import engine.db.archive.DataWarehouse;
import engine.db.archive.PvpRecord;
import engine.exception.MsgSendException;
import engine.exception.SerializationException;
import engine.gameManager.*;
import engine.job.JobContainer;
import engine.job.JobScheduler;
@@ -315,33 +314,32 @@ public class PlayerCharacter extends AbstractCharacter {
return returnBuilding;
}
public static void __serializeForClientMsg(PlayerCharacter playerCharacter, ByteBufferWriter writer) throws SerializationException {
public static void __serializeForClientMsg(PlayerCharacter playerCharacter, ByteBufferWriter writer) {
serializeForClientCommon(playerCharacter, writer, true, false, false, false);
}
public static void serializeForClientMsgLogin(PlayerCharacter playerCharacter, ByteBufferWriter writer) throws SerializationException {
public static void serializeForClientMsgLogin(PlayerCharacter playerCharacter, ByteBufferWriter writer) {
serializeForClientCommon(playerCharacter, writer, true, false, false, false);
}
public static void serializeForClientMsgCommit(PlayerCharacter playerCharacter, ByteBufferWriter writer) throws SerializationException {
public static void serializeForClientMsgCommit(PlayerCharacter playerCharacter, ByteBufferWriter writer) {
serializeForClientCommon(playerCharacter, writer, true, true, false, false);
}
public static void serializeForClientMsgFull(PlayerCharacter playerCharacter, ByteBufferWriter writer) throws SerializationException {
public static void serializeForClientMsgFull(PlayerCharacter playerCharacter, ByteBufferWriter writer) {
serializeForClientCommon(playerCharacter, writer, false, false, false, false);
}
public static void serializeForClientMsgOtherPlayer(PlayerCharacter playerCharacter, ByteBufferWriter writer) throws SerializationException {
public static void serializeForClientMsgOtherPlayer(PlayerCharacter playerCharacter, ByteBufferWriter writer) {
serializeForClientCommon(playerCharacter, writer, false, false, true, false);
}
public static void serializePlayerForClientMsgOtherPlayer(PlayerCharacter playerCharacter, ByteBufferWriter writer, boolean hideAsciiLastName) throws SerializationException {
public static void serializePlayerForClientMsgOtherPlayer(PlayerCharacter playerCharacter, ByteBufferWriter writer, boolean hideAsciiLastName) {
serializeForClientCommon(playerCharacter, writer, false, false, true, hideAsciiLastName);
}
// TODO what is a Fresh Char?
private static void serializeForClientCommon(PlayerCharacter playerCharacter, ByteBufferWriter writer, boolean loginData, boolean freshChar, boolean otherPlayer, boolean hideAsciiLastName)
throws SerializationException {
private static void serializeForClientCommon(PlayerCharacter playerCharacter, ByteBufferWriter writer, boolean loginData, boolean freshChar, boolean otherPlayer, boolean hideAsciiLastName) {
/*
* RUNES
src/engine/objects/Resists.java
+2 -2
View File
@@ -9,11 +9,11 @@
package engine.objects;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;
src/engine/objects/RuneBase.java
+1 -1
View File
@@ -9,8 +9,8 @@
package engine.objects;
import engine.mbEnums;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.net.ByteBufferWriter;
import engine.server.MBServerStatics;
src/engine/objects/RuneBaseAttribute.java
+1 -1
View File
@@ -9,8 +9,8 @@
package engine.objects;
import engine.mbEnums.GameObjectType;
import engine.gameManager.DbManager;
import engine.mbEnums.GameObjectType;
import java.sql.ResultSet;
import java.sql.SQLException;
src/engine/objects/Runegate.java
+1 -1
View File
@@ -1,7 +1,7 @@
package engine.objects;
import engine.mbEnums;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.net.ByteBufferWriter;
import java.util.ArrayList;
src/engine/objects/Shrine.java
+2 -2
View File
@@ -9,11 +9,11 @@
package engine.objects;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.mbEnums.BuildingGroup;
import engine.mbEnums.ShrineType;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import org.pmw.tinylog.Logger;
import java.sql.ResultSet;
src/engine/objects/SkillsBase.java
+1 -1
View File
@@ -9,8 +9,8 @@
package engine.objects;
import engine.mbEnums.SourceType;
import engine.gameManager.DbManager;
import engine.mbEnums.SourceType;
import engine.server.MBServerStatics;
import java.sql.ResultSet;
src/engine/objects/Zone.java
+1 -1
View File
@@ -9,13 +9,13 @@
package engine.objects;
import engine.mbEnums;
import engine.InterestManagement.Terrain;
import engine.db.archive.DataWarehouse;
import engine.gameManager.ZoneManager;
import engine.math.Bounds;
import engine.math.Vector2f;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.net.ByteBufferWriter;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;