merge conflicts

shnok · Jul 16, 2024 · 73047d7 · 73047d7
1 parent 7aae5ea
commit 73047d7
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/l2-unity/Assets/Scripts/Utils/DatUtils.cs b/l2-unity/Assets/Scripts/Utils/DatUtils.cs
@@ -25,12 +25,6 @@ public static bool ParseBaseAbstractItemGrpDat(Abstractgrp abstractgrp, string k
         switch (key) {
             case "object_id":
                 abstractgrp.ObjectId = int.Parse(value);
-
-                if (abstractgrp.ObjectId == 5789)
-                {
-                    var id = abstractgrp.ObjectId;
-                    Debug.Log("");
-                }
                 break;
             case "drop_texture": //{{[dropitems.drop_mfighter_m001_t02_u_m00];{[MFighter.MFighter_m001_t02_u]}}}
                 string[] modTex = DatUtils.ParseArray(value);