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

Removed ExAutoSoulShot and ShortCutInit from deleteShortCut method.

Browse Source 
Contributed by nasseka.
This commit is contained in:
MobiusDevelopment
2022-08-19 21:18:55 +00:00
parent 5d5b9c62c9
commit 8ab5c31458
10 changed files with 0 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java
View File

@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IRestorable;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.EtcItemType;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
public class ShortCuts implements IRestorable public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
return; return;
} }
deleteShortCutFromDb(old); deleteShortCutFromDb(old);
if (old.getType() == ShortcutType.ITEM)
{
final Item item = _owner.getInventory().getItemByObjectId(old.getId());
if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
{
_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
}
}
_owner.sendPacket(new ShortCutInit(_owner));
for (int shotId : _owner.getAutoSoulShot())
{
_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
}
} }
public synchronized void deleteShortCutByObjectId(int objectId) public synchronized void deleteShortCutByObjectId(int objectId)

18
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java
View File

@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IRestorable;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.EtcItemType;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
public class ShortCuts implements IRestorable public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
return; return;
} }
deleteShortCutFromDb(old); deleteShortCutFromDb(old);
if (old.getType() == ShortcutType.ITEM)
{
final Item item = _owner.getInventory().getItemByObjectId(old.getId());
if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
{
_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
}
}
_owner.sendPacket(new ShortCutInit(_owner));
for (int shotId : _owner.getAutoSoulShot())
{
_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
}
} }
public synchronized void deleteShortCutByObjectId(int objectId) public synchronized void deleteShortCutByObjectId(int objectId)

18
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java
View File

@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IRestorable;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.EtcItemType;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
public class ShortCuts implements IRestorable public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
return; return;
} }
deleteShortCutFromDb(old); deleteShortCutFromDb(old);
if (old.getType() == ShortcutType.ITEM)
{
final Item item = _owner.getInventory().getItemByObjectId(old.getId());
if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
{
_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
}
}
_owner.sendPacket(new ShortCutInit(_owner));
for (int shotId : _owner.getAutoSoulShot())
{
_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
}
} }
public synchronized void deleteShortCutByObjectId(int objectId) public synchronized void deleteShortCutByObjectId(int objectId)

18
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java
View File

@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IRestorable;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.EtcItemType;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
public class ShortCuts implements IRestorable public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
return; return;
} }
deleteShortCutFromDb(old); deleteShortCutFromDb(old);
if (old.getType() == ShortcutType.ITEM)
{
final Item item = _owner.getInventory().getItemByObjectId(old.getId());
if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
{
_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
}
}
_owner.sendPacket(new ShortCutInit(_owner));
for (int shotId : _owner.getAutoSoulShot())
{
_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
}
} }
public synchronized void deleteShortCutByObjectId(int objectId) public synchronized void deleteShortCutByObjectId(int objectId)

18
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java
View File

@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IRestorable;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.EtcItemType;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
public class ShortCuts implements IRestorable public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
return; return;
} }
deleteShortCutFromDb(old); deleteShortCutFromDb(old);
if (old.getType() == ShortcutType.ITEM)
{
final Item item = _owner.getInventory().getItemByObjectId(old.getId());
if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
{
_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
}
}
_owner.sendPacket(new ShortCutInit(_owner));
for (int shotId : _owner.getAutoSoulShot())
{
_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
}
} }
public synchronized void deleteShortCutByObjectId(int objectId) public synchronized void deleteShortCutByObjectId(int objectId)

18
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java
View File

@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IRestorable;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.EtcItemType;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
public class ShortCuts implements IRestorable public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
return; return;
} }
deleteShortCutFromDb(old); deleteShortCutFromDb(old);
if (old.getType() == ShortcutType.ITEM)
{
final Item item = _owner.getInventory().getItemByObjectId(old.getId());
if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
{
_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
}
}
_owner.sendPacket(new ShortCutInit(_owner));
for (int shotId : _owner.getAutoSoulShot())
{
_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
}
} }
public synchronized void deleteShortCutByObjectId(int objectId) public synchronized void deleteShortCutByObjectId(int objectId)

18
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java
View File

@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IRestorable;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.EtcItemType;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
public class ShortCuts implements IRestorable public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
return; return;
} }
deleteShortCutFromDb(old); deleteShortCutFromDb(old);
if (old.getType() == ShortcutType.ITEM)
{
final Item item = _owner.getInventory().getItemByObjectId(old.getId());
if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
{
_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
}
}
_owner.sendPacket(new ShortCutInit(_owner));
for (int shotId : _owner.getAutoSoulShot())
{
_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
}
} }
public synchronized void deleteShortCutByObjectId(int objectId) public synchronized void deleteShortCutByObjectId(int objectId)

18
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java
View File

@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IRestorable;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.EtcItemType;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
public class ShortCuts implements IRestorable public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
return; return;
} }
deleteShortCutFromDb(old); deleteShortCutFromDb(old);
if (old.getType() == ShortcutType.ITEM)
{
final Item item = _owner.getInventory().getItemByObjectId(old.getId());
if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
{
_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
}
}
_owner.sendPacket(new ShortCutInit(_owner));
for (int shotId : _owner.getAutoSoulShot())
{
_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
}
} }
public synchronized void deleteShortCutByObjectId(int objectId) public synchronized void deleteShortCutByObjectId(int objectId)

18
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ShortCuts.java
View File

@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IRestorable;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.EtcItemType;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
public class ShortCuts implements IRestorable public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
return; return;
} }
deleteShortCutFromDb(old); deleteShortCutFromDb(old);
if (old.getType() == ShortcutType.ITEM)
{
final Item item = _owner.getInventory().getItemByObjectId(old.getId());
if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
{
_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
}
}
_owner.sendPacket(new ShortCutInit(_owner));
for (int shotId : _owner.getAutoSoulShot())
{
_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
}
} }
public synchronized void deleteShortCutByObjectId(int objectId) public synchronized void deleteShortCutByObjectId(int objectId)

18
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ShortCuts.java
View File

@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.interfaces.IRestorable; import org.l2jmobius.gameserver.model.interfaces.IRestorable;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.item.type.EtcItemType;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
public class ShortCuts implements IRestorable public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
return; return;
} }
deleteShortCutFromDb(old); deleteShortCutFromDb(old);
if (old.getType() == ShortcutType.ITEM)
{
final Item item = _owner.getInventory().getItemByObjectId(old.getId());
if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
{
_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
}
}
_owner.sendPacket(new ShortCutInit(_owner));
for (int shotId : _owner.getAutoSoulShot())
{
_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
}
} }
public synchronized void deleteShortCutByObjectId(int objectId) public synchronized void deleteShortCutByObjectId(int objectId)