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

IdManager rework.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-07-17 23:04:59 +00:00
parent 93c43783b2
commit 88570ccc47
414 changed files with 4556 additions and 4860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java
View File

@@ -78,7 +78,7 @@ public class GameServer extends Thread
protected final CharStatTable _modifiers;
protected final World _world;
protected final CharTemplateTable _charTemplates;
protected final IdFactory _idFactory;
protected final IdManager _idFactory;
protected final SpawnTable _spawnTable;
protected final CharNameTable _charNametable;
protected final GameTimeController _gameTimeController;
@@ -147,7 +147,7 @@ public class GameServer extends Thread
_loginController = LoginController.getInstance();
_loginController.setMaxAllowedOnlinePlayers(Config.MAXIMUM_ONLINE_PLAYERS);
_charNametable = CharNameTable.getInstance();
_idFactory = IdFactory.getInstance();
_idFactory = IdManager.getInstance();
_itemTable = ItemTable.getInstance();
if (!_itemTable.isInitialized())
{

12
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/IdFactory.java → L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/IdManager.java
View File

@@ -27,16 +27,16 @@ import java.io.ObjectOutputStream;
import java.util.Stack;
import java.util.logging.Logger;
public class IdFactory
public class IdManager
{
private static Logger _log = Logger.getLogger(IdFactory.class.getName());
private static Logger _log = Logger.getLogger(IdManager.class.getName());
private int _curOID;
private Stack<Integer> _oldOIDs;
private static int FIRST_OID = 268435456;
private static IdFactory _instance;
private static IdManager _instance;
@SuppressWarnings("unchecked")
private IdFactory()
private IdManager()
{
try
{
@@ -54,11 +54,11 @@ public class IdFactory
}
}
public static IdFactory getInstance()
public static IdManager getInstance()
{
if (_instance == null)
{
_instance = new IdFactory();
_instance = new IdManager();
}
return _instance;
}

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ClanTable.java
View File

@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.StringTokenizer;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.IdFactory;
import org.l2jmobius.gameserver.IdManager;
import org.l2jmobius.gameserver.model.Clan;
import org.l2jmobius.gameserver.model.ClanMember;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -138,7 +138,7 @@ public class ClanTable
return null;
}
final Clan clan = new Clan();
clan.setClanId(IdFactory.getInstance().getNextId());
clan.setClanId(IdManager.getInstance().getNextId());
clan.setName(clanName);
clan.setLevel(0);
clan.setHasCastle(0);

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java
View File

@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.StringTokenizer;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.IdFactory;
import org.l2jmobius.gameserver.IdManager;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.ItemInstance;
import org.l2jmobius.gameserver.templates.Armor;
@@ -495,7 +495,7 @@ public class ItemTable
public ItemInstance createItem(int itemId)
{
final ItemInstance temp = new ItemInstance();
temp.setObjectId(IdFactory.getInstance().getNextId());
temp.setObjectId(IdManager.getInstance().getNextId());
temp.setItem(getTemplate(itemId));
World.getInstance().storeObject(temp);
return temp;

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/PetSummon.java
View File

@@ -17,7 +17,7 @@
*/
package org.l2jmobius.gameserver.handler.itemhandlers;
import org.l2jmobius.gameserver.IdFactory;
import org.l2jmobius.gameserver.IdManager;
import org.l2jmobius.gameserver.data.ExperienceTable;
import org.l2jmobius.gameserver.data.NpcTable;
import org.l2jmobius.gameserver.handler.IItemHandler;
@@ -82,7 +82,7 @@ public class PetSummon implements IItemHandler
final PetInstance newpet = new PetInstance(petTemplate);
newpet.setTitle(activeChar.getName());
newpet.setControlItemId(item.getObjectId());
newpet.setObjectId(IdFactory.getInstance().getNextId());
newpet.setObjectId(IdManager.getInstance().getNextId());
newpet.setX(activeChar.getX() + 50);
newpet.setY(activeChar.getY() + 100);
newpet.setZ(activeChar.getZ());

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -20,7 +20,7 @@ package org.l2jmobius.gameserver.model;
import java.lang.reflect.Constructor;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.IdFactory;
import org.l2jmobius.gameserver.IdManager;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.templates.Npc;
@@ -181,7 +181,7 @@ public class Spawn
_template
};
mob = (NpcInstance) _constructor.newInstance(parameters);
mob.setObjectId(IdFactory.getInstance().getNextId());
mob.setObjectId(IdManager.getInstance().getNextId());
mob.setAutoAttackable(mob instanceof MonsterInstance);
if (getRandomx() > 0)
{

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java
View File

@@ -30,7 +30,7 @@ import java.util.List;
import java.util.StringTokenizer;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.IdFactory;
import org.l2jmobius.gameserver.IdManager;
import org.l2jmobius.gameserver.data.CharNameTable;
import org.l2jmobius.gameserver.data.ClanTable;
import org.l2jmobius.gameserver.data.ItemTable;
@@ -211,7 +211,7 @@ public class ClientThread extends Thread
saveFile = new File(_charFolder, cha.getName() + "_warehouse.csv");
storeWarehouse(cha, saveFile);
}
IdFactory.getInstance().saveCurrentState();
IdManager.getInstance().saveCurrentState();
}
private void storeShortcuts(PlayerInstance cha, File saveFile)

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.io.IOException;
import org.l2jmobius.gameserver.IdFactory;
import org.l2jmobius.gameserver.IdManager;
import org.l2jmobius.gameserver.data.CharNameTable;
import org.l2jmobius.gameserver.data.CharTemplateTable;
import org.l2jmobius.gameserver.data.ItemTable;
@@ -89,7 +89,7 @@ public class CharacterCreate extends ClientBasePacket
private void initNewChar(ClientThread client, PlayerInstance newChar) throws IOException
{
newChar.setObjectId(IdFactory.getInstance().getNextId());
newChar.setObjectId(IdManager.getInstance().getNextId());
World.getInstance().storeObject(newChar);
final CharTemplate template = CharTemplateTable.getInstance().getTemplate(newChar.getClassId());
newChar.setAccuracy(template.getAcc());