Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleEventRecallCoordinator

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:31:22 +02:00
parent fbb0a08663
commit aea3a7921d
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
View File

@@ -35,7 +35,7 @@ import net.server.channel.Channel;
import net.server.channel.CharacterIdChannelPair; import net.server.channel.CharacterIdChannelPair;
import net.server.coordinator.session.Hwid; import net.server.coordinator.session.Hwid;
import net.server.coordinator.session.SessionCoordinator; import net.server.coordinator.session.SessionCoordinator;
import net.server.coordinator.world.MapleEventRecallCoordinator; import net.server.coordinator.world.EventRecallCoordinator;
import net.server.guild.GuildPackets; import net.server.guild.GuildPackets;
import net.server.guild.MapleAlliance; import net.server.guild.MapleAlliance;
import net.server.guild.MapleGuild; import net.server.guild.MapleGuild;
@@ -408,7 +408,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
} }
if (newcomer) { if (newcomer) {
EventInstanceManager eim = MapleEventRecallCoordinator.getInstance().recallEventInstance(cid); EventInstanceManager eim = EventRecallCoordinator.getInstance().recallEventInstance(cid);
if (eim != null) { if (eim != null) {
eim.registerPlayer(player); eim.registerPlayer(player);
} }

26
src/main/java/net/server/coordinator/world/MapleEventRecallCoordinator.java → src/main/java/net/server/coordinator/world/EventRecallCoordinator.java
View File

@@ -21,44 +21,44 @@ package net.server.coordinator.world;
import config.YamlConfig; import config.YamlConfig;
import scripting.event.EventInstanceManager; import scripting.event.EventInstanceManager;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
/** /**
*
* @author Ronan * @author Ronan
*/ */
public class MapleEventRecallCoordinator { public class EventRecallCoordinator {
private final static MapleEventRecallCoordinator instance = new MapleEventRecallCoordinator(); private final static EventRecallCoordinator instance = new EventRecallCoordinator();
public static MapleEventRecallCoordinator getInstance() { public static EventRecallCoordinator getInstance() {
return instance; return instance;
} }
private ConcurrentHashMap<Integer, EventInstanceManager> eventHistory = new ConcurrentHashMap<>(); private final ConcurrentHashMap<Integer, EventInstanceManager> eventHistory = new ConcurrentHashMap<>();
private static boolean isRecallableEvent(EventInstanceManager eim) { private static boolean isRecallableEvent(EventInstanceManager eim) {
return eim != null && !eim.isEventDisposed() && !eim.isEventCleared(); return eim != null && !eim.isEventDisposed() && !eim.isEventCleared();
} }
public EventInstanceManager recallEventInstance(int characterId) { public EventInstanceManager recallEventInstance(int characterId) {
EventInstanceManager eim = eventHistory.remove(characterId); EventInstanceManager eim = eventHistory.remove(characterId);
return isRecallableEvent(eim) ? eim : null; return isRecallableEvent(eim) ? eim : null;
} }
public void storeEventInstance(int characterId, EventInstanceManager eim) { public void storeEventInstance(int characterId, EventInstanceManager eim) {
if (YamlConfig.config.server.USE_ENABLE_RECALL_EVENT && isRecallableEvent(eim)) { if (YamlConfig.config.server.USE_ENABLE_RECALL_EVENT && isRecallableEvent(eim)) {
eventHistory.put(characterId, eim); eventHistory.put(characterId, eim);
} }
} }
public void manageEventInstances() { public void manageEventInstances() {
if (!eventHistory.isEmpty()) { if (!eventHistory.isEmpty()) {
List<Integer> toRemove = new LinkedList<>(); List<Integer> toRemove = new LinkedList<>();
for (Entry<Integer, EventInstanceManager> eh : eventHistory.entrySet()) { for (Entry<Integer, EventInstanceManager> eh : eventHistory.entrySet()) {
if (!isRecallableEvent(eh.getValue())) { if (!isRecallableEvent(eh.getValue())) {
toRemove.add(eh.getKey()); toRemove.add(eh.getKey());

4
src/main/java/net/server/task/EventRecallCoordinatorTask.java
View File

@@ -19,7 +19,7 @@
*/ */
package net.server.task; package net.server.task;
import net.server.coordinator.world.MapleEventRecallCoordinator; import net.server.coordinator.world.EventRecallCoordinator;
/** /**
* *
@@ -29,6 +29,6 @@ public class EventRecallCoordinatorTask implements Runnable {
@Override @Override
public void run() { public void run() {
MapleEventRecallCoordinator.getInstance().manageEventInstances(); EventRecallCoordinator.getInstance().manageEventInstances();
} }
} }

4
src/main/java/scripting/event/EventInstanceManager.java
View File

@@ -31,7 +31,7 @@ import net.server.audit.locks.*;
import net.server.audit.locks.factory.MonitoredReadLockFactory; import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory; import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import net.server.coordinator.world.MapleEventRecallCoordinator; import net.server.coordinator.world.EventRecallCoordinator;
import net.server.world.MapleParty; import net.server.world.MapleParty;
import net.server.world.MaplePartyCharacter; import net.server.world.MaplePartyCharacter;
import scripting.AbstractPlayerInteraction; import scripting.AbstractPlayerInteraction;
@@ -552,7 +552,7 @@ public class EventInstanceManager {
ex.printStackTrace(); ex.printStackTrace();
} }
MapleEventRecallCoordinator.getInstance().storeEventInstance(chr.getId(), this); EventRecallCoordinator.getInstance().storeEventInstance(chr.getId(), this);
} }
public void monsterKilled(Character chr, final MapleMonster mob) { public void monsterKilled(Character chr, final MapleMonster mob) {