lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper instant extract for stackable items.

Browse Source
This commit is contained in:
MobiusDev
2017-09-29 22:45:04 +00:00
parent 78a31bf170
commit 0d5271fe34
5 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -23,6 +23,7 @@ import java.util.Map;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.handler.IItemHandler;
import com.l2jmobius.gameserver.model.L2ExtractableProduct; import com.l2jmobius.gameserver.model.L2ExtractableProduct;
import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.actor.L2Playable;
@@ -108,7 +109,7 @@ public class ExtractableItems implements IItemHandler
continue; continue;
} }
if (item.isStackable() || (createItemAmount == 1)) if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
{ {
final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false); final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false);
if (expi.getMaxEnchant() > 0) if (expi.getMaxEnchant() > 0)
@@ -156,7 +157,7 @@ public class ExtractableItems implements IItemHandler
continue; continue;
} }
if (item.isStackable() || (createItemAmount == 1)) if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
{ {
final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false); final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false);
if (expi.getMaxEnchant() > 0) if (expi.getMaxEnchant() > 0)

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -23,6 +23,7 @@ import java.util.Map;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.handler.IItemHandler;
import com.l2jmobius.gameserver.model.L2ExtractableProduct; import com.l2jmobius.gameserver.model.L2ExtractableProduct;
import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.actor.L2Playable;
@@ -108,7 +109,7 @@ public class ExtractableItems implements IItemHandler
continue; continue;
} }
if (item.isStackable() || (createItemAmount == 1)) if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
{ {
final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false); final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false);
if (expi.getMaxEnchant() > 0) if (expi.getMaxEnchant() > 0)
@@ -156,7 +157,7 @@ public class ExtractableItems implements IItemHandler
continue; continue;
} }
if (item.isStackable() || (createItemAmount == 1)) if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
{ {
final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false); final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false);
if (expi.getMaxEnchant() > 0) if (expi.getMaxEnchant() > 0)

5
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -23,6 +23,7 @@ import java.util.Map;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.handler.IItemHandler;
import com.l2jmobius.gameserver.model.L2ExtractableProduct; import com.l2jmobius.gameserver.model.L2ExtractableProduct;
import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.actor.L2Playable;
@@ -108,7 +109,7 @@ public class ExtractableItems implements IItemHandler
continue; continue;
} }
if (item.isStackable() || (createItemAmount == 1)) if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
{ {
final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false); final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false);
if (expi.getMaxEnchant() > 0) if (expi.getMaxEnchant() > 0)
@@ -156,7 +157,7 @@ public class ExtractableItems implements IItemHandler
continue; continue;
} }
if (item.isStackable() || (createItemAmount == 1)) if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
{ {
final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false); final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false);
if (expi.getMaxEnchant() > 0) if (expi.getMaxEnchant() > 0)

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.itemhandlers;
import java.util.List; import java.util.List;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.handler.IItemHandler;
import com.l2jmobius.gameserver.model.L2ExtractableProduct; import com.l2jmobius.gameserver.model.L2ExtractableProduct;
import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.actor.L2Playable;
@@ -72,7 +73,7 @@ public class ExtractableItems implements IItemHandler
continue; continue;
} }
if (item.isStackable() || (createItemAmount == 1)) if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
{ {
activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, true); activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, true);
} }

5
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -23,6 +23,7 @@ import java.util.Map;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.handler.IItemHandler;
import com.l2jmobius.gameserver.model.L2ExtractableProduct; import com.l2jmobius.gameserver.model.L2ExtractableProduct;
import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.actor.L2Playable;
@@ -108,7 +109,7 @@ public class ExtractableItems implements IItemHandler
continue; continue;
} }
if (item.isStackable() || (createItemAmount == 1)) if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
{ {
final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false); final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false);
if (expi.getMaxEnchant() > 0) if (expi.getMaxEnchant() > 0)
@@ -156,7 +157,7 @@ public class ExtractableItems implements IItemHandler
continue; continue;
} }
if (item.isStackable() || (createItemAmount == 1)) if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
{ {
final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false); final L2ItemInstance newItem = activeChar.addItem("Extract", expi.getId(), createItemAmount, activeChar, false);
if (expi.getMaxEnchant() > 0) if (expi.getMaxEnchant() > 0)