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

StatSet getIntegerList rework and addition of setIntegerList.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-09-19 13:20:41 +00:00
parent c3889a0039
commit ad08f1081a
43 changed files with 974 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/StatSet.java
View File

@@ -392,16 +392,50 @@ public class StatSet implements IParserAdvUtils
return result;
}
public List<Integer> getIntegerList(String key, String splitOn)
public List<Integer> getIntegerList(String key)
{
final List<Integer> result = new ArrayList<>();
for (int i : getIntArray(key, splitOn))
final String val = getString(key, null);
final List<Integer> result;
if (val != null)
{
result.add(i);
final String[] splitVal = val.split(",");
result = new ArrayList<>(splitVal.length + 1);
for (String split : splitVal)
{
result.add(Integer.parseInt(split));
}
}
else
{
result = new ArrayList<>(1);
}
return result;
}
public void setIntegerList(String key, List<Integer> list)
{
if (key == null)
{
return;
}
if ((list == null) || list.isEmpty())
{
remove(key);
return;
}
final StringBuilder sb = new StringBuilder();
for (int element : list)
{
sb.append(element);
sb.append(",");
}
sb.deleteCharAt(sb.length() - 1); // Prettify value.
set(key, sb.toString());
}
@Override
public long getLong(String key)
{

45
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -14406,7 +14406,7 @@ public class PlayerInstance extends Playable
return;
}
final List<Integer> positions = getVariables().getIntegerList(PlayerVariables.AUTO_USE_SHORTCUTS, ",");
final List<Integer> positions = getVariables().getIntegerList(PlayerVariables.AUTO_USE_SHORTCUTS);
for (Shortcut shortcut : getAllShortCuts())
{
final Integer position = shortcut.getSlot() + (shortcut.getPage() * ShortCuts.MAX_SHORTCUTS_PER_BAR);
@@ -14436,16 +14436,7 @@ public class PlayerInstance extends Playable
public synchronized void addAutoShortcut(int slot, int page)
{
final List<Integer> positions;
if (getVariables().contains(PlayerVariables.AUTO_USE_SHORTCUTS))
{
positions = getVariables().getIntegerList(PlayerVariables.AUTO_USE_SHORTCUTS, ",");
}
else
{
positions = new ArrayList<>();
}
final List<Integer> positions = getVariables().getIntegerList(PlayerVariables.AUTO_USE_SHORTCUTS);
final Shortcut usedShortcut = getShortCut(slot, page);
if (usedShortcut == null)
{
@@ -14469,20 +14460,7 @@ public class PlayerInstance extends Playable
}
}
final StringBuilder variable = new StringBuilder();
for (int id : positions)
{
variable.append(id);
variable.append(",");
}
if (variable.isEmpty())
{
getVariables().remove(PlayerVariables.AUTO_USE_SHORTCUTS);
}
else
{
getVariables().set(PlayerVariables.AUTO_USE_SHORTCUTS, variable.toString());
}
getVariables().setIntegerList(PlayerVariables.AUTO_USE_SHORTCUTS, positions);
}
public synchronized void removeAutoShortcut(int slot, int page)
@@ -14492,7 +14470,7 @@ public class PlayerInstance extends Playable
return;
}
final List<Integer> positions = getVariables().getIntegerList(PlayerVariables.AUTO_USE_SHORTCUTS, ",");
final List<Integer> positions = getVariables().getIntegerList(PlayerVariables.AUTO_USE_SHORTCUTS);
final Shortcut usedShortcut = getShortCut(slot, page);
if (usedShortcut == null)
{
@@ -14513,20 +14491,7 @@ public class PlayerInstance extends Playable
}
}
final StringBuilder variable = new StringBuilder();
for (int id : positions)
{
variable.append(id);
variable.append(",");
}
if (variable.isEmpty())
{
getVariables().remove(PlayerVariables.AUTO_USE_SHORTCUTS);
}
else
{
getVariables().set(PlayerVariables.AUTO_USE_SHORTCUTS, variable.toString());
}
getVariables().setIntegerList(PlayerVariables.AUTO_USE_SHORTCUTS, positions);
}
public boolean isInTimedHuntingZone(int zoneId)

20
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
View File

@@ -76,9 +76,9 @@ public class RequestShortCutReg implements IClientIncomingPacket
player.sendPacket(new ExActivateAutoShortcut(sc, _active));
// When id is not auto used, deactivate auto shortcuts.
if (player.getVariables().contains(PlayerVariables.AUTO_USE_SHORTCUTS) && !player.getAutoUseSettings().getAutoSkills().contains(_id) && !player.getAutoUseSettings().getAutoSupplyItems().contains(_id))
if (!player.getAutoUseSettings().getAutoSkills().contains(_id) && !player.getAutoUseSettings().getAutoSupplyItems().contains(_id))
{
final List<Integer> positions = player.getVariables().getIntegerList(PlayerVariables.AUTO_USE_SHORTCUTS, ",");
final List<Integer> positions = player.getVariables().getIntegerList(PlayerVariables.AUTO_USE_SHORTCUTS);
final Integer position = _slot + (_page * ShortCuts.MAX_SHORTCUTS_PER_BAR);
if (!positions.contains(position))
{
@@ -86,21 +86,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
}
positions.remove(position);
final StringBuilder variable = new StringBuilder();
for (int id : positions)
{
variable.append(id);
variable.append(",");
}
if (variable.isEmpty())
{
player.getVariables().remove(PlayerVariables.AUTO_USE_SHORTCUTS);
}
else
{
player.getVariables().set(PlayerVariables.AUTO_USE_SHORTCUTS, variable.toString());
}
player.getVariables().setIntegerList(PlayerVariables.AUTO_USE_SHORTCUTS, positions);
return;
}

31
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java
View File

@@ -58,18 +58,15 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket
}
final List<Integer> favorites = new ArrayList<>();
if (player.getVariables().contains(PlayerVariables.FAVORITE_TELEPORTS))
for (int id : player.getVariables().getIntegerList(PlayerVariables.FAVORITE_TELEPORTS))
{
for (int id : player.getVariables().getIntArray(PlayerVariables.FAVORITE_TELEPORTS, ","))
if (TeleportListData.getInstance().getTeleport(_teleportId) == null)
{
if (TeleportListData.getInstance().getTeleport(_teleportId) == null)
{
LOGGER.warning("No registered teleport location for id: " + _teleportId);
}
else
{
favorites.add(id);
}
LOGGER.warning("No registered teleport location for id: " + _teleportId);
}
else
{
favorites.add(id);
}
}
@@ -85,18 +82,6 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket
favorites.remove((Integer) _teleportId);
}
String variable = "";
for (int id : favorites)
{
variable += id + ",";
}
if (variable.isEmpty())
{
player.getVariables().remove(PlayerVariables.FAVORITE_TELEPORTS);
}
else
{
player.getVariables().set(PlayerVariables.FAVORITE_TELEPORTS, variable);
}
player.getVariables().setIntegerList(PlayerVariables.FAVORITE_TELEPORTS, favorites);
}
}

15
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java
View File

@@ -16,6 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets.teleports;
import java.util.List;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
@@ -27,19 +29,12 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
*/
public class ExTeleportFavoritesList implements IClientOutgoingPacket
{
private final int[] _teleports;
private final List<Integer> _teleports;
private final boolean _enable;
public ExTeleportFavoritesList(PlayerInstance player, boolean enable)
{
if (player.getVariables().contains(PlayerVariables.FAVORITE_TELEPORTS))
{
_teleports = player.getVariables().getIntArray(PlayerVariables.FAVORITE_TELEPORTS, ",");
}
else
{
_teleports = new int[0];
}
_teleports = player.getVariables().getIntegerList(PlayerVariables.FAVORITE_TELEPORTS);
_enable = enable;
}
@@ -49,7 +44,7 @@ public class ExTeleportFavoritesList implements IClientOutgoingPacket
OutgoingPackets.EX_TELEPORT_FAVORITES_LIST.writeId(packet);
packet.writeC(_enable ? 0x01 : 0x00);
packet.writeD(_teleports.length);
packet.writeD(_teleports.size());
for (int id : _teleports)
{
packet.writeD(id);