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

Replaced disabled skills CopyOnWriteArrayList, also minor loc and PlayerInstance cleanups.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-09-29 14:33:47 +00:00
parent 12bc3abb9f
commit 5a26950843
6 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Loc.java
View File

@ -32,10 +32,8 @@ public class Loc implements IUserCommandHandler
@Override
public boolean useUserCommand(int id, PlayerInstance player)
{
final int _nearestTown = MapRegionData.getInstance().getClosestTownNumber(player);
SystemMessageId msg;
switch (_nearestTown)
final SystemMessageId msg;
switch (MapRegionData.getInstance().getClosestTownNumber(player))
{
case 0:
{

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -23,8 +23,8 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Future;
import java.util.logging.Logger;
@ -4337,7 +4337,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
public int geoPathGty;
}
protected List<Skill> _disabledSkills = new CopyOnWriteArrayList<>();
protected Set<Skill> _disabledSkills = ConcurrentHashMap.newKeySet();
private boolean _allSkillsDisabled;
protected MoveData _move;
private boolean _cursorKeyMovement = false;

1
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -700,7 +700,6 @@ public class PlayerInstance extends Playable
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// during teleport phase, players cant do any attack

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Loc.java
View File

@ -32,10 +32,8 @@ public class Loc implements IUserCommandHandler
@Override
public boolean useUserCommand(int id, PlayerInstance player)
{
final int _nearestTown = MapRegionData.getInstance().getClosestTownNumber(player);
SystemMessageId msg;
switch (_nearestTown)
final SystemMessageId msg;
switch (MapRegionData.getInstance().getClosestTownNumber(player))
{
case 0:
{

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -23,8 +23,8 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Future;
import java.util.logging.Logger;
@ -4385,7 +4385,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
public int geoPathGty;
}
protected List<Skill> _disabledSkills = new CopyOnWriteArrayList<>();
protected Set<Skill> _disabledSkills = ConcurrentHashMap.newKeySet();
private boolean _allSkillsDisabled;
protected MoveData _move;
private boolean _cursorKeyMovement = false;

1
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -714,7 +714,6 @@ public class PlayerInstance extends Playable
{
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// during teleport phase, players cant do any attack