Browse Source

Refactor out item useID

combat-2
MagicBot 8 months ago
parent
commit
7595f7dfb5
  1. 5
      src/engine/net/client/handlers/ObjectActionMsgHandler.java

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

@ -16,6 +16,7 @@ import engine.net.client.ClientConnection;
import engine.net.client.msg.*; import engine.net.client.msg.*;
import engine.objects.*; import engine.objects.*;
import engine.powers.PowersBase; import engine.powers.PowersBase;
import engine.powers.poweractions.AbstractPowerAction;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
import java.util.ArrayList; import java.util.ArrayList;
@ -531,9 +532,9 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
if (waterbucketBypass == false) { if (waterbucketBypass == false) {
String powerString = item.template.item_power_action.keySet().iterator().next(); String powerString = item.template.item_power_action.keySet().iterator().next();
int powerToken = PowersManager.ActionTokenByIDString.get(powerString); AbstractPowerAction powerAction = PowersManager.powerActionsByIDString.get(powerString);
int powerValue = item.template.item_power_action.get(powerString)[0]; int powerValue = item.template.item_power_action.get(powerString)[0];
PowersManager.applyPower(player, target, Vector3fImmutable.ZERO, powerToken, powerValue, true); PowersManager.applyPower(player, target, Vector3fImmutable.ZERO, powerAction.getUUID(), powerValue, true);
} }
itemMan.consume(item); itemMan.consume(item);
} else //just remove the item at this point } else //just remove the item at this point

Loading…
Cancel
Save