attack tree fixes to use toolbar state
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				studiorailgun/Renderer/pipeline/head This commit looks good
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	studiorailgun/Renderer/pipeline/head This commit looks good
				
			This commit is contained in:
		
							parent
							
								
									00176449e1
								
							
						
					
					
						commit
						42bc125897
					
				| @ -9,7 +9,7 @@ import electrosphere.test.annotations.IntegrationTest; | |||||||
| import electrosphere.engine.Globals; | import electrosphere.engine.Globals; | ||||||
| import electrosphere.entity.Entity; | import electrosphere.entity.Entity; | ||||||
| import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState; | 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.inventory.InventoryUtils; | ||||||
| import electrosphere.entity.state.movement.fall.ServerFallTree; | import electrosphere.entity.state.movement.fall.ServerFallTree; | ||||||
| import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; | import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; | ||||||
| @ -40,8 +40,8 @@ public class ServerAttackTreeTests extends EntityTestTemplate { | |||||||
| 
 | 
 | ||||||
|         //equip |         //equip | ||||||
|         Entity inInventoryItem = InventoryUtils.serverAttemptStoreItemTransform(creature, katana); |         Entity inInventoryItem = InventoryUtils.serverAttemptStoreItemTransform(creature, katana); | ||||||
|         ServerEquipState serverEquipState = ServerEquipState.getServerEquipState(creature); |         ServerToolbarState serverToolbarState = ServerToolbarState.getServerToolbarState(creature); | ||||||
|         serverEquipState.commandAttemptEquip(inInventoryItem, serverEquipState.getEquipPoint("handsCombined")); |         serverToolbarState.attemptEquip(inInventoryItem, 0); | ||||||
|          |          | ||||||
|         //Get the server-side player's trees |         //Get the server-side player's trees | ||||||
|         ServerAttackTree serverAttackTree = ServerAttackTree.getServerAttackTree(creature); |         ServerAttackTree serverAttackTree = ServerAttackTree.getServerAttackTree(creature); | ||||||
| @ -75,8 +75,8 @@ public class ServerAttackTreeTests extends EntityTestTemplate { | |||||||
| 
 | 
 | ||||||
|         //equip |         //equip | ||||||
|         Entity inInventoryItem = InventoryUtils.serverAttemptStoreItemTransform(creature, katana); |         Entity inInventoryItem = InventoryUtils.serverAttemptStoreItemTransform(creature, katana); | ||||||
|         ServerEquipState serverEquipState = ServerEquipState.getServerEquipState(creature); |         ServerToolbarState serverToolbarState = ServerToolbarState.getServerToolbarState(creature); | ||||||
|         serverEquipState.commandAttemptEquip(inInventoryItem, serverEquipState.getEquipPoint("handsCombined")); |         serverToolbarState.attemptEquip(inInventoryItem, 0); | ||||||
|          |          | ||||||
|         //Get the server-side player's trees |         //Get the server-side player's trees | ||||||
|         ServerAttackTree serverAttackTree = ServerAttackTree.getServerAttackTree(creature); |         ServerAttackTree serverAttackTree = ServerAttackTree.getServerAttackTree(creature); | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user