2
0
JIV 15 жил өмнө
parent
commit
8b5725b302

+ 11 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -2465,11 +2465,15 @@ public final class L2PcInstance extends L2Playable
 		if (unequipped == null)
 			return;
 		
-		if (unequipped.getItem().getType2() == L2Item.TYPE2_WEAPON &&
+		unequipped.setChargedSoulshot(L2ItemInstance.CHARGED_NONE);
+		unequipped.setChargedSpiritshot(L2ItemInstance.CHARGED_NONE);
+		
+		// on retail auto shots never disabled on uneqip
+		/*if (unequipped.getItem().getType2() == L2Item.TYPE2_WEAPON &&
 				(equipped == null ? true : equipped.getItem().getItemGradeSPlus() != unequipped.getItem().getItemGradeSPlus()))
 		{
 			disableAutoShotByCrystalType(unequipped.getItem().getItemGradeSPlus());
-		}
+		}*/
 	}
 	
 	public void useEquippableItem(L2ItemInstance item, boolean abortAttack)
@@ -2557,6 +2561,11 @@ public final class L2PcInstance extends L2Playable
 			
 			// Consume mana - will start a task if required; returns if item is not a shadow item
 			item.decreaseMana(false);
+			
+			if ((item.getItem().getBodyPart() & L2Item.SLOT_MULTI_ALLHAND) != 0)
+			{
+				rechargeAutoSoulShot(true, true, false);
+			}
 		}
 		sm = null;
 		

+ 0 - 48
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SuperCmdCharacterInfo.java

@@ -1,48 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jserver.gameserver.network.clientpackets;
-
-/**
- * Format chS
- * c: (id) 0x39
- * h: (subid) 0x00
- * S: the character name (or maybe cmd string ?)
- * @author -Wooden-
- *
- */
-public final class SuperCmdCharacterInfo extends L2GameClientPacket
-{
-	private static final String _C__39_00_SUPERCMDCHARACTERINFO = "[C] 39:00 SuperCmdCharacterInfo";
-	@SuppressWarnings("unused")
-	private String _characterName;
-	
-	@Override
-	protected void readImpl()
-	{
-		_characterName = readS();
-	}
-	
-	@Override
-	protected void runImpl()
-	{
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _C__39_00_SUPERCMDCHARACTERINFO;
-	}
-	
-}

+ 0 - 45
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SuperCmdServerStatus.java

@@ -1,45 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jserver.gameserver.network.clientpackets;
-
-/**
- * Format ch
- * c: (id) 0x39
- * h: (subid) 0x02
- * @author -Wooden-
- *
- */
-public final class SuperCmdServerStatus extends L2GameClientPacket
-{
-	private static final String _C__39_02_SUPERCMDSERVERSTATUS = "[C] 39:02 SuperCmdServerStatus";
-	
-	@Override
-	protected void readImpl()
-	{
-		// trigger packet
-	}
-	
-	@Override
-	protected void runImpl()
-	{
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _C__39_02_SUPERCMDSERVERSTATUS;
-	}
-	
-}

+ 0 - 48
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SuperCmdSummonCmd.java

@@ -1,48 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jserver.gameserver.network.clientpackets;
-
-/**
- * Format chS
- * c: (id) 0x39
- * h: (subid) 0x01
- * S: the summon name (or maybe cmd string ?)
- * @author -Wooden-
- *
- */
-public class SuperCmdSummonCmd extends L2GameClientPacket
-{
-	private static final String _C__39_01_SUPERCMDSUMMONCMD = "[C] 39:01 SuperCmdSummonCmd";
-	@SuppressWarnings("unused")
-	private String _summonName;
-	
-	@Override
-	protected void readImpl()
-	{
-		_summonName = readS();
-	}
-	
-	@Override
-	protected void runImpl()
-	{
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _C__39_01_SUPERCMDSUMMONCMD;
-	}
-	
-}