MagicBane
/
Server
92
0
Fork 2
Code Issues 13 Pull Requests Projects Releases Wiki Activity
Browse Source

Refactor out item useID

combat-2
MagicBot 8 months ago
parent
7595f7dfb5
commit
4f7c34aec9
1 changed files with 2 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/engine/net/client/handlers/ObjectActionMsgHandler.java

5
src/engine/net/client/handlers/ObjectActionMsgHandler.java
Unescape View File

@ -16,7 +16,6 @@ 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;
@ -532,9 +531,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();
AbstractPowerAction powerAction = PowersManager.powerActionsByIDString.get(powerString); PowersBase powerAction = PowersManager.powersBaseByIDString.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, powerAction.getUUID(), powerValue, true); PowersManager.applyPower(player, target, Vector3fImmutable.ZERO, powerAction.getToken(), powerValue, true);
} }
itemMan.consume(item); itemMan.consume(item);
} else //just remove the item at this point } else //just remove the item at this point

Write Preview
Loading…
Cancel
Save