Browse Source

Project reformat

combat-2
MagicBot 8 months ago
parent
commit
ee030a690a
  1. 1
      src/engine/db/handlers/dbItemHandler.java
  2. 5
      src/engine/db/handlers/dbPlayerCharacterHandler.java
  3. 5
      src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java
  4. 5
      src/engine/net/client/msg/WhoResponseMsg.java
  5. 2
      src/engine/objects/AbstractCharacter.java
  6. 1
      src/engine/objects/ItemTemplate.java

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

@ -216,6 +216,7 @@ public class dbItemHandler extends dbHandlerBase {
} }
} }
public Item GET_ITEM(final int itemUUID) { public Item GET_ITEM(final int itemUUID) {
Item item; Item item;

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

@ -11,7 +11,10 @@ package engine.db.handlers;
import engine.Enum; import engine.Enum;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.objects.*; import engine.objects.AbstractWorldObject;
import engine.objects.Heraldry;
import engine.objects.PlayerCharacter;
import engine.objects.PlayerFriends;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;

5
src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java

@ -12,7 +12,10 @@ import engine.net.client.msg.ArcLoginNotifyMsg;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.HotzoneChangeMsg; import engine.net.client.msg.HotzoneChangeMsg;
import engine.net.client.msg.PetMsg; import engine.net.client.msg.PetMsg;
import engine.objects.*; import engine.objects.Account;
import engine.objects.Guild;
import engine.objects.PlayerCharacter;
import engine.objects.PlayerFriends;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
import engine.session.Session; import engine.session.Session;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;

5
src/engine/net/client/msg/WhoResponseMsg.java

@ -14,7 +14,10 @@ import engine.gameManager.SessionManager;
import engine.net.*; import engine.net.*;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.Protocol; import engine.net.client.Protocol;
import engine.objects.*; import engine.objects.Guild;
import engine.objects.GuildStatusController;
import engine.objects.PlayerCharacter;
import engine.objects.PromotionClass;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;

2
src/engine/objects/AbstractCharacter.java

@ -638,6 +638,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
abstractCharacter.defenseRating = (short) (defense + 0.5f); abstractCharacter.defenseRating = (short) (defense + 0.5f);
} }
} }
/** /**
* @param abstractCharacter * @param abstractCharacter
* @ Calculates Atr (both hands) Defense, and Damage for pc * @ Calculates Atr (both hands) Defense, and Damage for pc
@ -1147,6 +1148,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
public final short getUnusedStatPoints() { public final short getUnusedStatPoints() {
return this.unusedStatPoints; return this.unusedStatPoints;
} }
@Override @Override
public String getName() { public String getName() {
if (this.firstName.length() == 0 && this.lastName.length() == 0) { if (this.firstName.length() == 0 && this.lastName.length() == 0) {

1
src/engine/objects/ItemTemplate.java

@ -23,7 +23,6 @@ public class ItemTemplate {
// Global template lookup // Global template lookup
public static HashMap<Integer, ItemTemplate> templates = new HashMap<>(); public static HashMap<Integer, ItemTemplate> templates = new HashMap<>();
public int template_id; public int template_id;
// Template Properties // Template Properties

Loading…
Cancel
Save