remove conflicting signature

hybrasyl · Jul 16, 2023 · 8fa88db · 8fa88db
1 parent cb4084d
commit 8fa88db
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/hybrasyl/Objects/Creature.cs b/hybrasyl/Objects/Creature.cs
@@ -576,7 +576,7 @@ public virtual bool UseCastable(Castable castableXml, Creature target = null)
             }
 
             // Handle statuses
-
+        
             foreach (var status in castableXml.AddStatuses)
                 if (World.WorldData.TryGetValue<Status>(status.Value, out var applyStatus))
                 {

diff --git a/hybrasyl/Objects/ItemObject.cs b/hybrasyl/Objects/ItemObject.cs
@@ -180,8 +180,9 @@ public uint RepairCost
     public bool Consumable => Template.Properties.Flags.HasFlag(ItemFlags.Consumable);
 
     public bool Undamageable => Template.Properties.Flags.HasFlag(ItemFlags.Undamageable);
-    public bool Bound => Template.Properties.Flags.HasFlag(ItemFlags.Bound);
 
+    public bool Bound => Template.Properties.Flags.HasFlag(ItemFlags.Bound);
+
     public bool IsVariant => Template.IsVariant;
 
     public Item ParentItem => Template.ParentItem;

diff --git a/hybrasyl/Scripting/HybrasylUser.cs b/hybrasyl/Scripting/HybrasylUser.cs
@@ -13,7 +13,7 @@
  * You should have received a copy of the Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * (C) 2020 ERISCO, LLC 
+ * (C) 2020 ERISCO, LLC
  *
  * For contributors and individual authors please refer to CONTRIBUTORS.MD.
  * 

diff --git a/hybrasyl/Scripting/HybrasylUtility.cs b/hybrasyl/Scripting/HybrasylUtility.cs
@@ -197,7 +197,7 @@ public static bool RegisterQuest(string id, string title, string summary, string
         Title = title
     });
 
-    public static bool RegisterQuest(QuestMetadata data) => Game.World.WorldState.RegisterQuest(data);
+    //public static bool RegisterQuest(QuestMetadata data) => Game.World.WorldState.RegisterQuest(data);
 
     public static void CreateMonster(int mapId, byte x, byte y, string creatureName, string behaviorSet, int level, bool aggro)
     {
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 // Handle statuses
                 foreach (var status in castableXml.AddStatuses)
                     if (World.WorldData.TryGetValue<Status>(status.Value, out var applyStatus))
                     {
@@ Expand Down @@