Browse Source

Duplicate method removed.

master
MagicBot 2 years ago
parent
commit
568b0291a2
  1. 12
      src/engine/db/handlers/dbBuildingHandler.java
  2. 20
      src/engine/db/handlers/dbItemHandler.java
  3. 14
      src/engine/objects/Item.java

12
src/engine/db/handlers/dbBuildingHandler.java

@ -649,11 +649,11 @@ public class dbBuildingHandler extends dbHandlerBase {
public final DbObjectType GET_UID_ENUM(long object_UID) { public final DbObjectType GET_UID_ENUM(long object_UID) {
DbObjectType storedEnum = DbObjectType.INVALID; DbObjectType objectType = DbObjectType.INVALID;
String objectType = "INVALID"; String typeString = "INVALID";
if (object_UID == 0) if (object_UID == 0)
return storedEnum; return objectType;
try (Connection connection = DbManager.getConnection(); try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT `type` FROM `object` WHERE `object`.`UID` = ? LIMIT 1;")) { PreparedStatement preparedStatement = connection.prepareStatement("SELECT `type` FROM `object` WHERE `object`.`UID` = ? LIMIT 1;")) {
@ -663,8 +663,8 @@ public class dbBuildingHandler extends dbHandlerBase {
ResultSet rs = preparedStatement.executeQuery(); ResultSet rs = preparedStatement.executeQuery();
if (rs.next()) { if (rs.next()) {
objectType = rs.getString("type").toUpperCase(); typeString = rs.getString("type").toUpperCase();
storedEnum = DbObjectType.valueOf(objectType); objectType = DbObjectType.valueOf(typeString);
} }
} catch (SQLException e) { } catch (SQLException e) {
@ -672,7 +672,7 @@ public class dbBuildingHandler extends dbHandlerBase {
return DbObjectType.INVALID; return DbObjectType.INVALID;
} }
return storedEnum; return objectType;
} }
public boolean updateBuildingRank(final Building b, int Rank) { public boolean updateBuildingRank(final Building b, int Rank) {

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

@ -107,26 +107,6 @@ public class dbItemHandler extends dbHandlerBase {
return null; return null;
} }
public String GET_OWNER(int ownerID) {
String ownerType;
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT `type` FROM `object` WHERE `UID`=?")) {
preparedStatement.setInt(1, ownerID);
ResultSet rs = preparedStatement.executeQuery();
ownerType = rs.getString("type");
} catch (SQLException e) {
Logger.error(e);
return "";
}
return ownerType;
}
public boolean DO_TRADE(HashSet<Integer> from1, HashSet<Integer> from2, public boolean DO_TRADE(HashSet<Integer> from1, HashSet<Integer> from2,
CharacterItemManager man1, CharacterItemManager man2, CharacterItemManager man1, CharacterItemManager man2,
Item inventoryGold1, Item inventoryGold2, int goldFrom1, int goldFrom2) { Item inventoryGold1, Item inventoryGold2, int goldFrom1, int goldFrom2) {

14
src/engine/objects/Item.java

@ -210,14 +210,20 @@ public class Item extends AbstractWorldObject {
this.durabilityCurrent = rs.getShort("item_durabilityCurrent"); this.durabilityCurrent = rs.getShort("item_durabilityCurrent");
this.durabilityMax = rs.getShort("item_durabilityMax"); this.durabilityMax = rs.getShort("item_durabilityMax");
String ot = DbManager.ItemQueries.GET_OWNER(this.ownerID); DbObjectType ownerType;
ownerType = DbManager.BuildingQueries.GET_UID_ENUM(this.ownerID);
if (ot.equals("character")) switch (ownerType) {
case CHARACTER:
this.ownerType = OwnerType.PlayerCharacter; this.ownerType = OwnerType.PlayerCharacter;
else if (ot.equals("npc")) break;
case NPC:
this.ownerType = OwnerType.Npc; this.ownerType = OwnerType.Npc;
else if (ot.equals("account")) break;
case ACCOUNT:
this.ownerType = OwnerType.Account; this.ownerType = OwnerType.Account;
break;
}
this.canDestroy = true; this.canDestroy = true;

Loading…
Cancel
Save