From 42bc125897414636e265900889d917d876d14257 Mon Sep 17 00:00:00 2001 From: austin Date: Mon, 30 Sep 2024 16:37:32 -0400 Subject: [PATCH] attack tree fixes to use toolbar state --- .../entity/state/attack/ServerAttackTreeTests.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java b/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java index e5e17d34..b86d6b66 100644 --- a/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java +++ b/src/test/java/electrosphere/entity/state/attack/ServerAttackTreeTests.java @@ -9,7 +9,7 @@ import electrosphere.test.annotations.IntegrationTest; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState; -import electrosphere.entity.state.equip.ServerEquipState; +import electrosphere.entity.state.equip.ServerToolbarState; import electrosphere.entity.state.inventory.InventoryUtils; import electrosphere.entity.state.movement.fall.ServerFallTree; import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; @@ -40,8 +40,8 @@ public class ServerAttackTreeTests extends EntityTestTemplate { //equip Entity inInventoryItem = InventoryUtils.serverAttemptStoreItemTransform(creature, katana); - ServerEquipState serverEquipState = ServerEquipState.getServerEquipState(creature); - serverEquipState.commandAttemptEquip(inInventoryItem, serverEquipState.getEquipPoint("handsCombined")); + ServerToolbarState serverToolbarState = ServerToolbarState.getServerToolbarState(creature); + serverToolbarState.attemptEquip(inInventoryItem, 0); //Get the server-side player's trees ServerAttackTree serverAttackTree = ServerAttackTree.getServerAttackTree(creature); @@ -75,8 +75,8 @@ public class ServerAttackTreeTests extends EntityTestTemplate { //equip Entity inInventoryItem = InventoryUtils.serverAttemptStoreItemTransform(creature, katana); - ServerEquipState serverEquipState = ServerEquipState.getServerEquipState(creature); - serverEquipState.commandAttemptEquip(inInventoryItem, serverEquipState.getEquipPoint("handsCombined")); + ServerToolbarState serverToolbarState = ServerToolbarState.getServerToolbarState(creature); + serverToolbarState.attemptEquip(inInventoryItem, 0); //Get the server-side player's trees ServerAttackTree serverAttackTree = ServerAttackTree.getServerAttackTree(creature);