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:17:36 -04:00
parent 96b4e1c639
commit 7595f7dfb5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/ObjectActionMsgHandler.java
+3 -2
View File
@@ -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