Item use improvements.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java

@@ -79,7 +79,6 @@ public class ItemSkillsTemplate implements IItemHandler
 			
 			if (itemSkill != null)
 			{
-				
 				if (itemSkill.hasEffectType(L2EffectType.EXTRACT_ITEM) && (playable.getActingPlayer() != null) && !playable.getActingPlayer().isInventoryUnder80(false))
 				{
 					playable.getActingPlayer().sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -8470,8 +8470,12 @@ public final class L2PcInstance extends L2Playable
 		// In case of double casting, check if both slots are occupied, then queue skill.
 		if ((!doubleCast && isCastingNow(SkillCaster::isAnyNormalType)) || (isCastingNow(s -> s.getCastingType() == SkillCastingType.NORMAL) && isCastingNow(s -> s.getCastingType() == SkillCastingType.NORMAL_SECOND)))
 		{
-			// Create a new SkillDat object and queue it in the player _queuedSkill
+			// Do not queue skill if called by an item.
-			setQueuedSkill(skill, item, forceUse, dontMove);
+			if (item == null)
+			{
+				// Create a new SkillDat object and queue it in the player _queuedSkill
+				setQueuedSkill(skill, item, forceUse, dontMove);
+			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java

@@ -38,6 +38,7 @@ import com.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import com.l2jmobius.gameserver.model.items.L2EtcItem;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.model.items.type.ActionType;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@@ -100,7 +101,7 @@ public final class UseItem implements IClientIncomingPacket
 			return;
 		}
 		
-		if (item.getItem().getType2() == L2Item.TYPE2_QUEST)
+		if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE))
 		{
 			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS);
 			return;
@@ -166,6 +167,13 @@ public final class UseItem implements IClientIncomingPacket
 			}
 		}
 		
+		// If item's default action is to show html, show item's main html.
+		if (item.getItem().getDefaultAction() == ActionType.SHOW_HTML)
+		{
+			item.onBypassFeedback(activeChar, null);
+			return;
+		}
+		
 		if (item.isEquipable())
 		{
 			// Don't allow to put formal wear while a cursed weapon is equipped.

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java

@@ -79,7 +79,6 @@ public class ItemSkillsTemplate implements IItemHandler
 			
 			if (itemSkill != null)
 			{
-				
 				if (itemSkill.hasEffectType(L2EffectType.EXTRACT_ITEM) && (playable.getActingPlayer() != null) && !playable.getActingPlayer().isInventoryUnder80(false))
 				{
 					playable.getActingPlayer().sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -8471,8 +8471,12 @@ public final class L2PcInstance extends L2Playable
 		// In case of double casting, check if both slots are occupied, then queue skill.
 		if ((!doubleCast && isCastingNow(SkillCaster::isAnyNormalType)) || (isCastingNow(s -> s.getCastingType() == SkillCastingType.NORMAL) && isCastingNow(s -> s.getCastingType() == SkillCastingType.NORMAL_SECOND)))
 		{
-			// Create a new SkillDat object and queue it in the player _queuedSkill
+			// Do not queue skill if called by an item.
-			setQueuedSkill(skill, item, forceUse, dontMove);
+			if (item == null)
+			{
+				// Create a new SkillDat object and queue it in the player _queuedSkill
+				setQueuedSkill(skill, item, forceUse, dontMove);
+			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java

@@ -38,6 +38,7 @@ import com.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import com.l2jmobius.gameserver.model.items.L2EtcItem;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.model.items.type.ActionType;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@@ -100,7 +101,7 @@ public final class UseItem implements IClientIncomingPacket
 			return;
 		}
 		
-		if (item.getItem().getType2() == L2Item.TYPE2_QUEST)
+		if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE))
 		{
 			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS);
 			return;
@@ -166,6 +167,13 @@ public final class UseItem implements IClientIncomingPacket
 			}
 		}
 		
+		// If item's default action is to show html, show item's main html.
+		if (item.getItem().getDefaultAction() == ActionType.SHOW_HTML)
+		{
+			item.onBypassFeedback(activeChar, null);
+			return;
+		}
+		
 		if (item.isEquipable())
 		{
 			// Don't allow to put formal wear while a cursed weapon is equipped.

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java

@@ -79,7 +79,6 @@ public class ItemSkillsTemplate implements IItemHandler
 			
 			if (itemSkill != null)
 			{
-				
 				if (itemSkill.hasEffectType(L2EffectType.EXTRACT_ITEM) && (playable.getActingPlayer() != null) && !playable.getActingPlayer().isInventoryUnder80(false))
 				{
 					playable.getActingPlayer().sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -8473,8 +8473,12 @@ public final class L2PcInstance extends L2Playable
 		// In case of double casting, check if both slots are occupied, then queue skill.
 		if ((!doubleCast && isCastingNow(SkillCaster::isAnyNormalType)) || (isCastingNow(s -> s.getCastingType() == SkillCastingType.NORMAL) && isCastingNow(s -> s.getCastingType() == SkillCastingType.NORMAL_SECOND)))
 		{
-			// Create a new SkillDat object and queue it in the player _queuedSkill
+			// Do not queue skill if called by an item.
-			setQueuedSkill(skill, item, forceUse, dontMove);
+			if (item == null)
+			{
+				// Create a new SkillDat object and queue it in the player _queuedSkill
+				setQueuedSkill(skill, item, forceUse, dontMove);
+			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java

@@ -38,6 +38,7 @@ import com.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import com.l2jmobius.gameserver.model.items.L2EtcItem;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.model.items.type.ActionType;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@@ -100,7 +101,7 @@ public final class UseItem implements IClientIncomingPacket
 			return;
 		}
 		
-		if (item.getItem().getType2() == L2Item.TYPE2_QUEST)
+		if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE))
 		{
 			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS);
 			return;
@@ -166,6 +167,13 @@ public final class UseItem implements IClientIncomingPacket
 			}
 		}
 		
+		// If item's default action is to show html, show item's main html.
+		if (item.getItem().getDefaultAction() == ActionType.SHOW_HTML)
+		{
+			item.onBypassFeedback(activeChar, null);
+			return;
+		}
+		
 		if (item.isEquipable())
 		{
 			// Don't allow to put formal wear while a cursed weapon is equipped.

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java

@@ -79,7 +79,6 @@ public class ItemSkillsTemplate implements IItemHandler
 			
 			if (itemSkill != null)
 			{
-				
 				if (itemSkill.hasEffectType(L2EffectType.EXTRACT_ITEM) && (playable.getActingPlayer() != null) && !playable.getActingPlayer().isInventoryUnder80(false))
 				{
 					playable.getActingPlayer().sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -8470,8 +8470,12 @@ public final class L2PcInstance extends L2Playable
 		// In case of double casting, check if both slots are occupied, then queue skill.
 		if ((!doubleCast && isCastingNow(SkillCaster::isAnyNormalType)) || (isCastingNow(s -> s.getCastingType() == SkillCastingType.NORMAL) && isCastingNow(s -> s.getCastingType() == SkillCastingType.NORMAL_SECOND)))
 		{
-			// Create a new SkillDat object and queue it in the player _queuedSkill
+			// Do not queue skill if called by an item.
-			setQueuedSkill(skill, item, forceUse, dontMove);
+			if (item == null)
+			{
+				// Create a new SkillDat object and queue it in the player _queuedSkill
+				setQueuedSkill(skill, item, forceUse, dontMove);
+			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java

@@ -38,6 +38,7 @@ import com.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import com.l2jmobius.gameserver.model.items.L2EtcItem;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.model.items.type.ActionType;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@@ -100,7 +101,7 @@ public final class UseItem implements IClientIncomingPacket
 			return;
 		}
 		
-		if (item.getItem().getType2() == L2Item.TYPE2_QUEST)
+		if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE))
 		{
 			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS);
 			return;
@@ -166,6 +167,13 @@ public final class UseItem implements IClientIncomingPacket
 			}
 		}
 		
+		// If item's default action is to show html, show item's main html.
+		if (item.getItem().getDefaultAction() == ActionType.SHOW_HTML)
+		{
+			item.onBypassFeedback(activeChar, null);
+			return;
+		}
+		
 		if (item.isEquipable())
 		{
 			// Don't allow to put formal wear while a cursed weapon is equipped.

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java

@@ -79,7 +79,6 @@ public class ItemSkillsTemplate implements IItemHandler
 			
 			if (itemSkill != null)
 			{
-				
 				if (itemSkill.hasEffectType(L2EffectType.EXTRACT_ITEM) && (playable.getActingPlayer() != null) && !playable.getActingPlayer().isInventoryUnder80(false))
 				{
 					playable.getActingPlayer().sendPacket(SystemMessageId.YOU_VE_EXCEEDED_THE_LIMIT_AND_CANNOT_RETRIEVE_THE_ITEM_PLEASE_CHECK_YOUR_LIMIT_IN_THE_INVENTORY);

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -8414,8 +8414,12 @@ public final class L2PcInstance extends L2Playable
 		// In case of double casting, check if both slots are occupied, then queue skill.
 		if ((!doubleCast && isCastingNow(SkillCaster::isAnyNormalType)) || (isCastingNow(s -> s.getCastingType() == SkillCastingType.NORMAL) && isCastingNow(s -> s.getCastingType() == SkillCastingType.NORMAL_SECOND)))
 		{
-			// Create a new SkillDat object and queue it in the player _queuedSkill
+			// Do not queue skill if called by an item.
-			setQueuedSkill(skill, item, forceUse, dontMove);
+			if (item == null)
+			{
+				// Create a new SkillDat object and queue it in the player _queuedSkill
+				setQueuedSkill(skill, item, forceUse, dontMove);
+			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java

@@ -38,6 +38,7 @@ import com.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import com.l2jmobius.gameserver.model.items.L2EtcItem;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.model.items.type.ActionType;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@@ -100,7 +101,7 @@ public final class UseItem implements IClientIncomingPacket
 			return;
 		}
 		
-		if (item.getItem().getType2() == L2Item.TYPE2_QUEST)
+		if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE))
 		{
 			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS);
 			return;
@@ -166,6 +167,13 @@ public final class UseItem implements IClientIncomingPacket
 			}
 		}
 		
+		// If item's default action is to show html, show item's main html.
+		if (item.getItem().getDefaultAction() == ActionType.SHOW_HTML)
+		{
+			item.onBypassFeedback(activeChar, null);
+			return;
+		}
+		
 		if (item.isEquipable())
 		{
 			// Don't allow to put formal wear while a cursed weapon is equipped.