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

Refactor out itembase

Browse Source
This commit is contained in:
MagicBot
2024-03-15 10:35:41 -04:00
parent f676b14351
commit 6ed4faded2
16 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/ActivateNPCMsgHandler.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
for (Item hirelings : player.getInventory()) {
if (hirelings.template.item_type.equals(ItemType.EMPLOYMENTCONTRACT)) {
contract = DbManager.ContractQueries.GET_CONTRACT(hirelings.templsteID);
contract = DbManager.ContractQueries.GET_CONTRACT(hirelings.templateID);
if (contract == null)
continue;
src/engine/net/client/handlers/ObjectActionMsgHandler.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
if (itemMan.doesCharOwnThisItem(item.getObjectUUID())) {
int uuid = item.templsteID;
int uuid = item.templateID;
switch (item.template.item_type) {
src/engine/net/client/msg/ItemProductionMsg.java
+2 -2
View File
@@ -284,7 +284,7 @@ public class ItemProductionMsg extends ClientNetMsg {
writer.putInt(this.itemUUID);
writer.putInt(0); //items left to produce?
if (toRoll != null) {
writer.putInt(toRoll.getTemplsteID());
writer.putInt(toRoll.getTemplateID());
writer.putInt(toRoll.getValue());
} else {
writer.putInt(0);
@@ -301,7 +301,7 @@ public class ItemProductionMsg extends ClientNetMsg {
timeLeft /= 1000;
writer.putInt((int) timeLeft);
writer.putInt(vendor.getRollingTimeInSeconds(toRoll.getTemplsteID()));
writer.putInt(vendor.getRollingTimeInSeconds(toRoll.getTemplateID()));
}
} else {
src/engine/net/client/msg/ManageNPCMsg.java
+2 -2
View File
@@ -450,14 +450,14 @@ public class ManageNPCMsg extends ClientNetMsg {
writer.putInt(i.getObjectUUID());
writer.putInt(0);
writer.putInt(i.getTemplsteID());
writer.putInt(i.getTemplateID());
writer.putInt(template.item_value);
long timeLife = i.getDateToUpgrade() - System.currentTimeMillis();
timeLife /= 1000;
writer.putInt((int) timeLife);
writer.putInt(npc.getRollingTimeInSeconds(i.getTemplsteID()));
writer.putInt(npc.getRollingTimeInSeconds(i.getTemplateID()));
writer.putInt(1);
if (i.isComplete())