From af98cebc476c4115df6807702555e0c71626a6f1 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 25 Oct 2017 23:19:10 +0000 Subject: [PATCH] AuctionItem is now created by same class. --- .../gameserver/model/itemauction/AuctionItem.java | 9 +++++---- .../gameserver/model/itemauction/AuctionItem.java | 9 +++++---- .../gameserver/model/itemauction/AuctionItem.java | 9 +++++---- .../gameserver/model/itemauction/AuctionItem.java | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 9b3c9a7f42..22f7a0625a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -17,7 +17,9 @@ package com.l2jmobius.gameserver.model.itemauction; import com.l2jmobius.gameserver.datatables.ItemTable; +import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.model.L2Augmentation; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -77,16 +79,15 @@ public final class AuctionItem public final L2ItemInstance createNewItemInstance() { - final L2ItemInstance item = ItemTable.getInstance().createItem("ItemAuction", _itemId, _itemCount, null, null); - + final L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), _itemId); + L2World.getInstance().storeObject(item); + item.setCount(_itemCount); item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); - final int augmentationId = _itemExtra.getInt("augmentation_id", 0); if (augmentationId > 0) { item.setAugmentation(new L2Augmentation(augmentationId)); } - return item; } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 9b3c9a7f42..22f7a0625a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -17,7 +17,9 @@ package com.l2jmobius.gameserver.model.itemauction; import com.l2jmobius.gameserver.datatables.ItemTable; +import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.model.L2Augmentation; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -77,16 +79,15 @@ public final class AuctionItem public final L2ItemInstance createNewItemInstance() { - final L2ItemInstance item = ItemTable.getInstance().createItem("ItemAuction", _itemId, _itemCount, null, null); - + final L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), _itemId); + L2World.getInstance().storeObject(item); + item.setCount(_itemCount); item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); - final int augmentationId = _itemExtra.getInt("augmentation_id", 0); if (augmentationId > 0) { item.setAugmentation(new L2Augmentation(augmentationId)); } - return item; } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 9b3c9a7f42..22f7a0625a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -17,7 +17,9 @@ package com.l2jmobius.gameserver.model.itemauction; import com.l2jmobius.gameserver.datatables.ItemTable; +import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.model.L2Augmentation; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -77,16 +79,15 @@ public final class AuctionItem public final L2ItemInstance createNewItemInstance() { - final L2ItemInstance item = ItemTable.getInstance().createItem("ItemAuction", _itemId, _itemCount, null, null); - + final L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), _itemId); + L2World.getInstance().storeObject(item); + item.setCount(_itemCount); item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); - final int augmentationId = _itemExtra.getInt("augmentation_id", 0); if (augmentationId > 0) { item.setAugmentation(new L2Augmentation(augmentationId)); } - return item; } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 9b3c9a7f42..22f7a0625a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -17,7 +17,9 @@ package com.l2jmobius.gameserver.model.itemauction; import com.l2jmobius.gameserver.datatables.ItemTable; +import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.model.L2Augmentation; +import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -77,16 +79,15 @@ public final class AuctionItem public final L2ItemInstance createNewItemInstance() { - final L2ItemInstance item = ItemTable.getInstance().createItem("ItemAuction", _itemId, _itemCount, null, null); - + final L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), _itemId); + L2World.getInstance().storeObject(item); + item.setCount(_itemCount); item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); - final int augmentationId = _itemExtra.getInt("augmentation_id", 0); if (augmentationId > 0) { item.setAugmentation(new L2Augmentation(augmentationId)); } - return item; } } \ No newline at end of file