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

Removed packet locks and relative improvements.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-11-07 14:55:39 +00:00
parent 3f1cf5d1a7
commit b764d444df
128 changed files with 775 additions and 2146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java vendored
View File

@@ -16,7 +16,6 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.enums.SubclassInfoType;
import org.l2jmobius.gameserver.model.StatsSet;
@@ -28,6 +27,7 @@ import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillList;
import org.l2jmobius.gameserver.network.serverpackets.ExStorageMaxCount;
import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -53,40 +53,40 @@ public class ClassChange extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effected.isPlayer())
if (!effected.isPlayer())
{
final PlayerInstance player = effected.getActingPlayer();
// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
ThreadPool.schedule(() ->
{
final int activeClass = player.getClassId().getId();
if (!player.setActiveClass(_index))
{
player.sendMessage("You cannot switch your class right now!");
return;
}
if (OlympiadManager.getInstance().isRegisteredInComp(player))
{
OlympiadManager.getInstance().unRegisterNoble(player);
}
final Skill identifyCrisis = SkillData.getInstance().getSkill(IDENTITY_CRISIS_SKILL_ID, 1);
if (identifyCrisis != null)
{
identifyCrisis.applyEffects(player, player);
}
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_SWITCHED_S1_TO_S2);
msg.addClassId(activeClass);
msg.addClassId(player.getClassId().getId());
player.sendPacket(msg);
player.broadcastUserInfo();
player.sendPacket(new AcquireSkillList(player));
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
}, 100);
return;
}
final PlayerInstance player = effected.getActingPlayer();
if (player.isTransformed() || player.isSubclassLocked() || player.isAffectedBySkill(IDENTITY_CRISIS_SKILL_ID))
{
player.sendMessage("You cannot switch your class right now!");
return;
}
final Skill identityCrisis = SkillData.getInstance().getSkill(IDENTITY_CRISIS_SKILL_ID, 1);
if (identityCrisis != null)
{
identityCrisis.applyEffects(player, player);
}
if (OlympiadManager.getInstance().isRegisteredInComp(player))
{
OlympiadManager.getInstance().unRegisterNoble(player);
}
final int activeClass = player.getClassId().getId();
player.setActiveClass(_index);
final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_SWITCHED_S1_TO_S2);
msg.addClassId(activeClass);
msg.addClassId(player.getClassId().getId());
player.sendPacket(msg);
player.broadcastUserInfo();
player.sendPacket(new ExStorageMaxCount(player));
player.sendPacket(new AcquireSkillList(player));
player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
}
}

9
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java
View File

@@ -98,7 +98,6 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
import org.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
import org.l2jmobius.gameserver.util.Broadcast;
@@ -921,9 +920,7 @@ public class Npc extends Creature
{
player.setReputation(player.getReputation() - Formulas.calculateKarmaGain(player.getPkKills(), killer.isSummon()));
player.setPkKills(player.getPkKills() + 1);
final UserInfo ui = new UserInfo(player, false);
ui.addComponentType(UserInfoType.SOCIAL);
player.sendPacket(ui);
player.broadcastUserInfo(UserInfoType.SOCIAL);
player.checkItemRestriction();
// pk item rewards
if (Config.REWARD_PK_ITEM)
@@ -954,9 +951,7 @@ public class Npc extends Creature
else if (Config.FAKE_PLAYER_KILL_PVP)
{
player.setPvpKills(player.getPvpKills() + 1);
final UserInfo ui = new UserInfo(player, false);
ui.addComponentType(UserInfoType.SOCIAL);
player.sendPacket(ui);
player.broadcastUserInfo(UserInfoType.SOCIAL);
// pvp item rewards
if (Config.REWARD_PVP_ITEM)
{

46
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -41,7 +41,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.StampedLock;
import java.util.logging.Level;
import java.util.stream.Collectors;
@@ -719,11 +718,6 @@ public class PlayerInstance extends Playable
private ScheduledFuture<?> _taskRentPet;
private ScheduledFuture<?> _taskWater;
/** Packet delay locks */
private final StampedLock _skillListPacketLock = new StampedLock();
private final StampedLock _userInfoPacketLock = new StampedLock();
private final StampedLock _storageMaxPacketLock = new StampedLock();
/** Last Html Npcs, 0 = last html was not bound to an npc */
private final int[] _htmlActionOriginObjectIds = new int[HtmlActionScope.values().length];
/**
@@ -2147,16 +2141,6 @@ public class PlayerInstance extends Playable
EventDispatcher.getInstance().notifyEventAsync(new OnPlayerEquipItem(this, item), this);
}
public boolean setStorageMaxCountPacketLock(boolean lock)
{
if (lock)
{
return _storageMaxPacketLock.tryWriteLock() != 0;
}
_storageMaxPacketLock.tryUnlockWrite();
return false;
}
/**
* @return the the PvP Kills of the PlayerInstance (Number of player killed during a PvP).
*/
@@ -4002,16 +3986,6 @@ public class PlayerInstance extends Playable
}
}
public boolean setUserInfoPacketLock(boolean lock)
{
if (lock)
{
return _userInfoPacketLock.tryWriteLock() != 0;
}
_userInfoPacketLock.tryUnlockWrite();
return false;
}
/**
* Send a Server->Client packet UserInfo to this PlayerInstance and CharInfo to all PlayerInstance in its _KnownPlayers. <B><U> Concept</U> :</B> Others PlayerInstance in the detection area of the PlayerInstance are identified in <B>_knownPlayers</B>. In order to inform other players of this
* PlayerInstance state modifications, server just need to go through _knownPlayers to send Server->Client Packet <B><U> Actions</U> :</B>
@@ -4084,9 +4058,7 @@ public class PlayerInstance extends Playable
public void broadcastTitleInfo()
{
// Send a Server->Client packet UserInfo to this PlayerInstance
final UserInfo ui = new UserInfo(this, false);
ui.addComponentType(UserInfoType.CLAN);
sendPacket(ui);
broadcastUserInfo(UserInfoType.CLAN);
// Send a Server->Client packet TitleUpdate to all PlayerInstance in _KnownPlayers of the PlayerInstance
broadcastPacket(new NicknameChanged(this));
@@ -8051,7 +8023,7 @@ public class PlayerInstance extends Playable
return false;
}
if (isLocked())
if (isSubclassLocked())
{
LOGGER.warning("Player " + getName() + " tried to restart/logout during class change.");
return false;
@@ -9417,16 +9389,6 @@ public class PlayerInstance extends Playable
return _wantsPeace;
}
public boolean setSkillListPacketLock(boolean lock)
{
if (lock)
{
return _skillListPacketLock.tryWriteLock() != 0;
}
_skillListPacketLock.tryUnlockWrite();
return false;
}
public void sendSkillList()
{
sendSkillList(0);
@@ -9895,7 +9857,7 @@ public class PlayerInstance extends Playable
}
}
public boolean isLocked()
public boolean isSubclassLocked()
{
return _subclassLock.isLocked();
}
@@ -12172,7 +12134,7 @@ public class PlayerInstance extends Playable
public boolean isAllowedToEnchantSkills()
{
if (isLocked())
if (isSubclassLocked())
{
return false;
}

4
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
View File

@@ -306,9 +306,7 @@ public class PlayerStat extends PlayableStat
return false;
}
final UserInfo ui = new UserInfo(getActiveChar(), false);
ui.addComponentType(UserInfoType.CURRENT_HPMPCP_EXP_SP);
getActiveChar().sendPacket(ui);
getActiveChar().broadcastUserInfo(UserInfoType.CURRENT_HPMPCP_EXP_SP);
return true;
}

5
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/NotifyExitBeautyShop.java
View File

@@ -20,7 +20,6 @@ import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
/**
* @author Sdw
@@ -42,8 +41,6 @@ public class NotifyExitBeautyShop implements IClientIncomingPacket
return;
}
final UserInfo userInfo = new UserInfo(player, false);
userInfo.addComponentType(UserInfoType.APPAREANCE);
client.sendPacket(userInfo);
player.broadcastUserInfo(UserInfoType.APPAREANCE);
}
}

8
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
View File

@@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import org.l2jmobius.gameserver.model.SkillLearn;
@@ -37,16 +36,11 @@ public class AcquireSkillList implements IClientOutgoingPacket
public AcquireSkillList(PlayerInstance player)
{
if (player.setSkillListPacketLock(true))
if (!player.isSubclassLocked()) // Changing class.
{
_player = player;
_learnable = SkillTreesData.getInstance().getAvailableSkills(player, player.getClassId(), false, false);
_learnable.addAll(SkillTreesData.getInstance().getNextAvailableSkills(player, player.getClassId(), false, false));
ThreadPool.schedule(() ->
{
player.setSkillListPacketLock(false);
}, 300);
}
}

8
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java
View File

@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.stats.Stats;
@@ -42,7 +41,7 @@ public class ExStorageMaxCount implements IClientOutgoingPacket
public ExStorageMaxCount(PlayerInstance player)
{
if (player.setStorageMaxCountPacketLock(true))
if (!player.isSubclassLocked()) // Changing class.
{
_player = player;
_inventory = player.getInventoryLimit();
@@ -55,11 +54,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket
_recipe = player.getCommonRecipeLimit();
_inventoryExtraSlots = (int) player.getStat().getValue(Stats.INVENTORY_NORMAL, 0);
_inventoryQuestItems = Config.INVENTORY_MAXIMUM_QUEST_ITEMS;
ThreadPool.schedule(() ->
{
player.setStorageMaxCountPacketLock(false);
}, 1000);
}
}

29
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java
View File

@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.xml.impl.ExperienceData;
import org.l2jmobius.gameserver.enums.UserInfoType;
@@ -62,31 +61,12 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
public UserInfo(PlayerInstance player)
{
_player = player;
_relation = calculateRelation(player);
_moveMultiplier = player.getMovementSpeedMultiplier();
_runSpd = (int) Math.round(player.getRunSpeed() / _moveMultiplier);
_walkSpd = (int) Math.round(player.getWalkSpeed() / _moveMultiplier);
_swimRunSpd = (int) Math.round(player.getSwimRunSpeed() / _moveMultiplier);
_swimWalkSpd = (int) Math.round(player.getSwimWalkSpeed() / _moveMultiplier);
_flyRunSpd = player.isFlying() ? _runSpd : 0;
_flyWalkSpd = player.isFlying() ? _walkSpd : 0;
_enchantLevel = player.getInventory().getWeaponEnchant();
_armorEnchant = player.getInventory().getArmorMinEnchant();
_title = player.getTitle();
if (player.isGM() && player.isInvisible())
{
_title = "[Invisible]";
}
addComponentType(UserInfoType.values());
this(player, true);
}
public UserInfo(PlayerInstance player, boolean addAll)
{
if (player.setUserInfoPacketLock(true))
if (!player.isSubclassLocked()) // Changing class.
{
_player = player;
@@ -111,11 +91,6 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
{
addComponentType(UserInfoType.values());
}
ThreadPool.schedule(() ->
{
player.setUserInfoPacketLock(false);
}, 1000);
}
}