Do not swing arm when right-clicking entity

Author: Gjum

spockbot/plugins/helpers/interact.py

@@ -196,15 +196,18 @@ def use_entity(self, entity, cursor_pos=None,
         """
         if self.auto_look:
             self.look_at(Vector3(entity))  # TODO look at cursor_pos
-        if cursor_pos is not None:
+
+        if cursor_pos is not None and action == constants.INTERACT_ENTITY:
             action = constants.INTERACT_ENTITY_AT
+
         packet = {'target': entity.eid, 'action': action}
         if action == constants.INTERACT_ENTITY_AT:
             packet['target_x'] = cursor_pos.x
             packet['target_y'] = cursor_pos.y
             packet['target_z'] = cursor_pos.z
         self.net.push_packet('PLAY>Use Entity', packet)
-        if self.auto_swing:
+
+        if self.auto_swing and action == constants.ATTACK_ENTITY:
             self.swing_arm()
 
     def attack_entity(self, entity):

tests/plugins/helpers/test_interact.py

@@ -115,13 +115,22 @@ def test_activate_item(self):
         # TODO deactivate_item
 
     def test_entity(self):
+        # interact entity should not swing arm
         entity = DataDict(eid=234, x=2, y=2 + constants.PLAYER_EYE_HEIGHT, z=4)
-
         self.plug.use_entity(entity)
         self.assertAlmostEqual(ClientInfoMock.position.yaw, -45)
         self.assertAlmostEqual(ClientInfoMock.position.pitch, 0)
-        self.assertEqual(NetMock.datas[-2].action, constants.INTERACT_ENTITY)
-        self.assertEqual(NetMock.datas[-2].target, 234)
+        self.assertEqual(NetMock.datas[-1].action, constants.INTERACT_ENTITY)
+        self.assertEqual(NetMock.datas[-1].target, 234)
+        self.assertEqual(len(NetMock.datas), 1)
+
+        # attack entity should swing arm
+        entity = DataDict(eid=235, x=2, y=2 + constants.PLAYER_EYE_HEIGHT, z=4)
+        self.plug.use_entity(entity, action=constants.ATTACK_ENTITY)
+        self.assertAlmostEqual(ClientInfoMock.position.yaw, -45)
+        self.assertAlmostEqual(ClientInfoMock.position.pitch, 0)
+        self.assertEqual(NetMock.datas[-2].action, constants.ATTACK_ENTITY)
+        self.assertEqual(NetMock.datas[-2].target, 235)
         self.assertEqual(NetMock.idents[-1], 'PLAY>Animation')
 
         self.plug.auto_look = False