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

Refactor out item useID

Browse Source
This commit is contained in:
MagicBot
2024-03-11 12:07:46 -04:00
parent efab8eefba
commit 96b4e1c639
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/ObjectActionMsgHandler.java
+7 -4
View File
@@ -340,7 +340,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
pam.setX(loc.getX() + 64); //offset grid from tol
pam.setY(loc.getY());
pam.setZ(loc.getZ() + 64); //offset grid from tol
pam.addPlacementInfo(ib.getUseID());
pam.addPlacementInfo(item.template.deed_structure_id);
dispatch = Dispatch.borrow(player, pam);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
@@ -529,9 +529,12 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
DispatchMessage.sendToAllInRange(player, vum);
}
if (waterbucketBypass == false)
PowersManager.applyPower(player, target, Vector3fImmutable.ZERO, ib.getUseID(), ib.getUseAmount(), true);
if (waterbucketBypass == false) {
String powerString = item.template.item_power_action.keySet().iterator().next();
int powerToken = PowersManager.ActionTokenByIDString.get(powerString);
int powerValue = item.template.item_power_action.get(powerString)[0];
PowersManager.applyPower(player, target, Vector3fImmutable.ZERO, powerToken, powerValue, true);
}
itemMan.consume(item);
} else //just remove the item at this point
itemMan.consume(item);
src/engine/net/client/handlers/PlaceAssetMsgHandler.java
+2 -1
View File
@@ -347,7 +347,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
Item contract = null;
for (Item inventoryItem : playerCharacter.getInventory()) {
if (inventoryItem.getItemBase().getUseID() == buildingList.getBlueprintUUID()) {
if (inventoryItem.template.item_type.equals(ItemType.DEED) &&
inventoryItem.template.deed_structure_id == buildingList.getBlueprintUUID()) {
contract = inventoryItem;
break;
}