Poprawki 2

Author: KoBeWi

Scenes/GameOver.tscn

@@ -51,6 +51,7 @@ one_shot = true
 anchor_right = 1.0
 anchor_bottom = 1.0
 texture = ExtResource( 1 )
+expand = true
 
 [node name="Label" type="Label" parent="."]
 anchor_left = 0.5

Scripts/Enemy.gd

@@ -27,10 +27,11 @@ func server_ai(delta): pass
 func general_ai(delta): pass
 
 func hit(body):
-	if Com.is_server:
-		if body.is_in_group("player_attack"):
+	if body.is_in_group("player_attack"):
+		if body.player:
 			last_attacker = body.player.get_meta("id")
-			
+		
+		if Com.is_server:
 			if has_meta("attackers"):
 				var id = body.player.get_meta("id")
 

Scripts/Player.gd

@@ -235,7 +235,7 @@ func process_attack():
 					get_weapon().set_disabled(false)
 					attack = true
 					weapon_point.visible = true
-					anim.playback_speed = get_weapon().speed + (1 if souls[4] == 15 else 0)
+					anim.playback_speed = get_weapon().speed + (1 if souls and souls[4] == 15 else 0)
 					animation = str(get_weapon().attack_type, "Attack", "Crouch" if crouch else "", direction())
 					anim.play(animation)
 	elif Controls.SOUL in key_press:

Scripts/UI/LabelManager.gd

@@ -19,12 +19,13 @@ func on_enemy_attacked(enemy, damage):
 	else:
 		enemy.set_meta("hp", enemy.stats.max_hp - damage)
 
-	if !enemy.has_meta("label") or !is_instance_valid(enemy.get_meta("label")):
-		var label = push_label(ENEMY, [enemy.enemy_name, enemy.get_meta("hp"), enemy.stats.max_hp])
-		enemy.set_meta("label", label)
-	elif enemy.has_meta("label"):
-		enemy.get_meta("label").set_bar(enemy.get_meta("hp"), enemy.stats.max_hp)
-		enemy.get_meta("label").restart()
+	if enemy.last_attacker == Com.player.get_meta("id"):
+		if !enemy.has_meta("label") or !is_instance_valid(enemy.get_meta("label")):
+			var label = push_label(ENEMY, [enemy.enemy_name, enemy.get_meta("hp"), enemy.stats.max_hp])
+			enemy.set_meta("label", label)
+		elif enemy.has_meta("label"):
+			enemy.get_meta("label").set_bar(enemy.get_meta("hp"), enemy.stats.max_hp)
+			enemy.get_meta("label").restart()
 
 func push_label(type, data):
 	var label = preload("res://Nodes/UI/InfoLabel.tscn").instance()

Server/Character.cs

@@ -233,11 +233,16 @@ public void EquipItem(byte slot, byte from) {
 
         var oldEquip = equipment[slot];
 
-        if (from < 255) {
-            equipment.AsBsonArray[slot] = inventory[from];
-            inventory.RemoveAt(from);
-        } else {
-            equipment.AsBsonArray[slot] = 0;
+        try {
+            if (from < 255) {
+                equipment.AsBsonArray[slot] = inventory[from];
+                inventory.RemoveAt(from);
+            } else {
+                equipment.AsBsonArray[slot] = 0;
+            }
+        } catch (ArgumentOutOfRangeException) {
+            Console.WriteLine("Invalid item index: " + from);
+            return;
         }
 
         if (oldEquip > 0) inventory.Add(oldEquip);
@@ -257,11 +262,16 @@ public void EquipSoul(byte slot, byte from) {
 
             var oldEquip = equipment[slot];
 
-            if (from < 255) {
-                equipment.AsBsonArray[slot] = inventory[from];
-                inventory.RemoveAt(from);
-            } else {
-                equipment.AsBsonArray[slot] = 0;
+            try {
+                if (from < 255) {
+                    equipment.AsBsonArray[slot] = inventory[from];
+                    inventory.RemoveAt(from);
+                } else {
+                    equipment.AsBsonArray[slot] = 0;
+                }
+            } catch (ArgumentOutOfRangeException) {
+                Console.WriteLine("Invalid soul index: " + from);
+                return;
             }
 
             if (oldEquip > 0) inventory.Add(oldEquip);

TODO.txt

@@ -1,14 +1,6 @@
 -błąd +dodatek >zmiana
 
 -equip soul nie zawsze dobrze działa
-System.ArgumentOutOfRangeException: Index was out of range. Must be non-negative and less than the size of the collection.
-Parameter name: index
-  at System.Collections.Generic.List`1[T].get_Item (System.Int32 index) [0x00009] in <52405d1838e24bc5b300f5ebeee9f7c4>:0
-  at MongoDB.Bson.BsonArray.get_Item (System.Int32 index) [0x00000] in <751ae1b3f1ce46e29ca107c13a2209ca>:0
-  at Character.EquipSoul (System.Byte slot, System.Byte from) [0x00053] in X:\Studia\Magister\the-soulhunter\Server\Character.cs:261
-  at Unpacker.HandlePacket (Database database, Player player) [0x00344] in X:\Studia\Magister\the-soulhunter\Server\Unpacker.cs:127
-  at Server.ClientLoop (System.Object _client) [0x0013a] in X:\Studia\Magister\the-soulhunter\Server\Server.cs:120
--nie powinno być labelki wrogów od innyc graczy
 +zabezpieczenia przed złymi pakietami, wywołaniami metod z niepoprawnymi danymi itp.
 -żaby mają dałna i skaczą do tyłu
 +informacje jak ktoś wchodzi albo umiera