fixed enchanting crash on damaged items and serious crafting bug

laz1444 · laz1444 · commit 284ba48c5e7c · 2024-03-25T22:33:42.000+02:00
diff --git a/src/MiNET/MiNET/Enchantment.cs b/src/MiNET/MiNET/Enchantment.cs
@@ -101,8 +101,11 @@ public static void SendEnchantments(Player player, Item itemToEnchant)
 		{
 			if (itemToEnchant.ExtraData != null)
 			{
-				SendEmptyEnchantments(player);
-				return;
+				if (itemToEnchant.ExtraData.Contains("ench"))
+				{
+					SendEmptyEnchantments(player);
+					return;
+				}
 			}
 
 			var rnd = new Random();
diff --git a/src/MiNET/MiNET/ItemStackInventoryManager.cs b/src/MiNET/MiNET/ItemStackInventoryManager.cs
@@ -482,7 +482,7 @@ protected virtual uint ProcessCraftAction(CraftAction action)
 		protected virtual void ProcessCraftAuto(CraftAutoAction action)
 		{
 			RecipeManager.resultMap.TryGetValue((int)action.RecipeNetworkId, out Item item);
-			_player.Inventory.UiInventory.Slots[50] = new Item(item.Id, item.Metadata, item.Count * action.craftCount);
+			_player.Inventory.UiInventory.Slots[50] = ItemFactory.GetItem(item.Id, item.Metadata, item.Count * action.craftCount);
 		}
 
 		protected virtual void ProcessCraftCreativeAction(CraftCreativeAction action)

Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,11 @@ public static void SendEnchantments(Player player, Item itemToEnchant)`
`101`	`101`	`{`
`102`	`102`	`if (itemToEnchant.ExtraData != null)`
`103`	`103`	`{`
`104`		`- SendEmptyEnchantments(player);`
`105`		`- return;`
	`104`	`+ if (itemToEnchant.ExtraData.Contains("ench"))`
	`105`	`+ {`
	`106`	`+ SendEmptyEnchantments(player);`
	`107`	`+ return;`
	`108`	`+ }`
`106`	`109`	`}`
`107`	`110`
`108`	`111`	`var rnd = new Random();`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ protected virtual uint ProcessCraftAction(CraftAction action)`
`482`	`482`	`protected virtual void ProcessCraftAuto(CraftAutoAction action)`
`483`	`483`	`{`
`484`	`484`	`RecipeManager.resultMap.TryGetValue((int)action.RecipeNetworkId, out Item item);`
`485`		`- _player.Inventory.UiInventory.Slots[50] = new Item(item.Id, item.Metadata, item.Count * action.craftCount);`
	`485`	`+ _player.Inventory.UiInventory.Slots[50] = ItemFactory.GetItem(item.Id, item.Metadata, item.Count * action.craftCount);`
`486`	`486`	`}`
`487`	`487`
`488`	`488`	`protected virtual void ProcessCraftCreativeAction(CraftCreativeAction action)`