Index: java/com/l2jserver/gameserver/model/olympiad/OlympiadGame.java
===================================================================
--- java/com/l2jserver/gameserver/model/olympiad/OlympiadGame.java (revision 4415)
+++ java/com/l2jserver/gameserver/model/olympiad/OlympiadGame.java (working copy)
@@ -39,1 +39,68 @@
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.olympiad.Olympiad.COMP_TYPE;
import com.l2jserver.gameserver.network.SystemMessageId;
@@ -285,5 +285,6 @@
player.getActiveWeaponInstance().setChargedSpiritshot(L2ItemInstance.CHARGED_NONE);
}
+
+ for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++)
+ {
+ L2ItemInstance equippedItem = player.getInventory().getPaperdollItem(i);
+ if ((equippedItem != null) && equippedItem.isOlyRestrictedItem())
+ {
+ player.getInventory().unEquipItemInSlotAndRecord(i);
+ }
+ }
// enable skills with cool time <= 15 minutes
O
Index: java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java (revision 5229)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java (working copy)
@@ -13694,7 +13694,8 @@
for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++)
{
L2ItemInstance equippedItem = getInventory().getPaperdollItem(i);
- if (equippedItem != null && !equippedItem.getItem().checkCondition(this, this, false))
+ if (equippedItem != null && (!equippedItem.getItem().checkCondition(this, this, false)
+ || (isInOlympiadMode() && equippedItem.isOlyRestrictedItem())))
{
getInventory().unEquipItemInSlotAndRecord(i);