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

Services unrestrained to channels + Event scripts placeholder

Browse Source 
Fixed an inconsistent scenario where player data would remain in world player storage even though they were no longer online.
Implemented missing functionality for "Safety Charm" which allows 30% MaxHP/MP heal on return.
Improved services facility, no longer tightly related to channels.
Implemented a world service for "save players" (services acts as a monitor).
Reviewed the event script initialization approach. Players no longer are retained from logging in on a channel whilst the events don't finish loadup.
Fixed certain quest items not showing up, which would happen due to them not being quest requisites.
Fixed NPC Pi crashing players when trying to craft arrows.
Fixed pet re-evolution quest not working on Robos.
Fixed boss HPBar not disappearing in certain situations.
Revised gathered mob info on linked mobs, no longer marshaling stats.
Fixed two possible deadlock scenarios within the cancel effect method.
Added lock auditing support for read-write locks.
Implemented code support for Cygnus intro clip.
Reviewed updateBuffEffect, now properly checking for pirate buffs in order to send the expected packet.
Reviewed unnecessary load of field objects, which would be doing so just for fetching the predicted map names.
Fixed mob buff tooltips not showing on "fake" mobs in the event of them turning into "real".
Reviewed usage of "unique" constraint on petid within the inventoryitems table.
Fixed portal in Ariant unexpectedly leading players who completed the "secret passageway" of Sleepywood into it.
Fixed a loop case in quest scripts from Magatia's broker having ore request.
This commit is contained in:
ronancpl
2019-10-29 01:48:58 -03:00
parent 54cdba01ae
commit 7d8d4691da
80 changed files with 944 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/net/server/PlayerStorage.java
View File

@@ -28,18 +28,19 @@ import java.util.Collection;
import java.util.List;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReadLock;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
public class PlayerStorage {
private final ReentrantReadWriteLock locks = new MonitoredReentrantReadWriteLock(MonitoredLockType.PLAYER_STORAGE, true);
private final MonitoredReentrantReadWriteLock locks = new MonitoredReentrantReadWriteLock(MonitoredLockType.PLAYER_STORAGE, true);
private final Map<Integer, MapleCharacter> storage = new LinkedHashMap<>();
private final Map<String, MapleCharacter> nameStorage = new LinkedHashMap<>();
private ReadLock rlock = locks.readLock();
private WriteLock wlock = locks.writeLock();
private MonitoredReadLock rlock = MonitoredReadLockFactory.createLock(locks);
private MonitoredWriteLock wlock = MonitoredWriteLockFactory.createLock(locks);
public void addPlayer(MapleCharacter chr) {
wlock.lock();

26
src/net/server/Server.java
View File

@@ -41,15 +41,16 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import config.YamlConfig;
import net.server.audit.ThreadTracker;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReadLock;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import net.MapleServerHandler;
import net.mina.MapleCodecFactory;
@@ -87,7 +88,6 @@ import client.SkillFactory;
import client.command.CommandsExecutor;
import client.inventory.Item;
import client.inventory.ItemFactory;
import client.inventory.MaplePet;
import client.inventory.manipulator.MapleCashidGenerator;
import client.newyear.NewYearCardRecord;
import constants.inventory.ItemConstants;
@@ -146,13 +146,13 @@ public class Server {
private final Lock srvLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.SERVER);
private final Lock disLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.SERVER_DISEASES);
private final ReentrantReadWriteLock wldLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.SERVER_WORLDS, true);
private final ReadLock wldRLock = wldLock.readLock();
private final WriteLock wldWLock = wldLock.writeLock();
private final MonitoredReentrantReadWriteLock wldLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.SERVER_WORLDS, true);
private final MonitoredReadLock wldRLock = MonitoredReadLockFactory.createLock(wldLock);
private final MonitoredWriteLock wldWLock = MonitoredWriteLockFactory.createLock(wldLock);
private final ReentrantReadWriteLock lgnLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.SERVER_LOGIN, true);
private final ReadLock lgnRLock = lgnLock.readLock();
private final WriteLock lgnWLock = lgnLock.writeLock();
private final MonitoredReentrantReadWriteLock lgnLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.SERVER_LOGIN, true);
private final MonitoredReadLock lgnRLock = MonitoredReadLockFactory.createLock(lgnLock);
private final MonitoredWriteLock lgnWLock = MonitoredWriteLockFactory.createLock(lgnLock);
private final AtomicLong currentTime = new AtomicLong(0);
private long serverCurrentTime = 0;
@@ -1896,13 +1896,13 @@ public class Server {
}
}
}
resetServerWorlds();
ThreadManager.getInstance().stop();
TimerManager.getInstance().purge();
TimerManager.getInstance().stop();
resetServerWorlds();
System.out.println("Worlds + Channels are offline.");
acceptor.unbind();
acceptor = null;

1
src/net/server/audit/locks/MonitoredLockType.java
View File

@@ -78,6 +78,7 @@ public enum MonitoredLockType {
WORLD_PSHOPS,
WORLD_MERCHS,
WORLD_MAPOBJS,
WORLD_SAVECHARS,
WORLD_SUGGEST,
EIM,
EIM_PARTY,

39
src/net/server/channel/Channel.java
View File

@@ -34,9 +34,11 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import net.server.audit.locks.MonitoredReadLock;
import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import config.YamlConfig;
import net.server.audit.LockCollector;
@@ -64,6 +66,10 @@ import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.transport.socket.SocketSessionConfig;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import client.MapleCharacter;
import net.server.services.ServicesManager;
import net.server.services.BaseService;
import net.server.services.type.ChannelServices;
import scripting.event.EventScriptManager;
import server.TimerManager;
import server.events.gm.MapleEvent;
@@ -73,13 +79,9 @@ import server.maps.MapleHiredMerchant;
import server.maps.MapleMap;
import server.maps.MapleMapManager;
import server.maps.MapleMiniDungeon;
import server.maps.MapleMiniDungeonInfo;
import tools.MaplePacketCreator;
import tools.Pair;
import client.MapleCharacter;
import net.server.channel.services.ServiceType;
import net.server.channel.services.ServicesManager;
import net.server.channel.services.task.BaseService;
import server.maps.MapleMiniDungeonInfo;
public final class Channel {
@@ -90,7 +92,7 @@ public final class Channel {
private String ip, serverMessage;
private MapleMapManager mapManager;
private EventScriptManager eventSM;
private ServicesManager services = new ServicesManager();
private ServicesManager services;
private Map<Integer, MapleHiredMerchant> hiredMerchants = new HashMap<>();
private final Map<Integer, Integer> storedVars = new HashMap<>();
private Set<Integer> playersAway = new HashSet<>();
@@ -121,9 +123,9 @@ public final class Channel {
private Set<Integer> ongoingCathedralGuests = null;
private long ongoingStartTime;
private ReentrantReadWriteLock merchantLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.MERCHANT, true);
private ReadLock merchRlock = merchantLock.readLock();
private WriteLock merchWlock = merchantLock.writeLock();
private MonitoredReentrantReadWriteLock merchantLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.MERCHANT, true);
private MonitoredReadLock merchRlock = MonitoredReadLockFactory.createLock(merchantLock);
private MonitoredWriteLock merchWlock = MonitoredWriteLockFactory.createLock(merchantLock);
private MonitoredReentrantLock faceLock[] = new MonitoredReentrantLock[YamlConfig.config.server.CHANNEL_LOCKS];
@@ -155,8 +157,8 @@ public final class Channel {
eventSM = new EventScriptManager(this, getEvents());
eventSM.init();
} else {
String[] ev = {};
eventSM = new EventScriptManager(null, ev);
String[] ev = {"0_EXAMPLE"};
eventSM = new EventScriptManager(this, ev);
}
dojoStage = new int[20];
@@ -168,7 +170,7 @@ public final class Channel {
dojoTask[i] = null;
}
services = new ServicesManager();
services = new ServicesManager(ChannelServices.OVERALL);
System.out.println(" Channel " + getId() + ": Listening on port " + port);
} catch (Exception e) {
@@ -181,10 +183,9 @@ public final class Channel {
return;
}
eventSM.cancel();
eventSM.cancel();
eventSM = null;
eventSM = new EventScriptManager(this, getEvents());
eventSM.init();
}
public final synchronized void shutdown() {
@@ -199,7 +200,7 @@ public final class Channel {
disconnectAwayPlayers();
players.disconnectAll();
eventSM.cancel();
eventSM.dispose();
eventSM = null;
mapManager.dispose();
@@ -277,7 +278,7 @@ public final class Channel {
return mapManager;
}
public BaseService getServiceAccess(ServiceType sv) {
public BaseService getServiceAccess(ChannelServices sv) {
return services.getAccess(sv).getService();
}

3
src/net/server/channel/handlers/NPCAnimationHandler.java
View File

@@ -39,7 +39,8 @@ public final class NPCAnimationHandler extends AbstractMaplePacketHandler {
if (length == 6) { // NPC Talk
mplew.writeShort(SendOpcode.NPC_ACTION.getValue());
mplew.writeInt(slea.readInt());
mplew.writeShort(slea.readShort());
mplew.write(slea.readByte()); // 2 bytes, thanks resinate
mplew.write(slea.readByte());
c.announce(mplew.getPacket());
} else if (length > 6) { // NPC Move
byte[] bytes = slea.read(length - 9);

18
src/net/server/channel/handlers/PlayerLoggedinHandler.java
View File

@@ -63,7 +63,6 @@ import client.inventory.MapleInventoryType;
import client.inventory.MaplePet;
import constants.game.GameConstants;
import constants.game.ScriptableNPCConstants;
import constants.net.ServerConstants;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
@@ -116,30 +115,27 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
}
Channel cserv = wserv.getChannel(c.getChannel());
if(cserv == null || !cserv.isActive()) {
if(cserv == null) {
c.setChannel(1);
cserv = wserv.getChannel(c.getChannel());
if(cserv == null) {
c.disconnect(true, false);
return;
} else if (!cserv.isActive()) {
c.announce(MaplePacketCreator.getAfterLoginError(7));
return;
}
}
MapleCharacter player = wserv.getPlayerStorage().getCharacterById(cid);
boolean newcomer = false;
IoSession session = c.getSession();
if (!server.validateCharacteridInTransition(session, cid)) {
c.disconnect(true, false);
return;
}
String remoteHwid;
if (player == null) {
if (!server.validateCharacteridInTransition(session, cid)) {
c.disconnect(true, false);
return;
}
remoteHwid = MapleSessionCoordinator.getInstance().getGameSessionHwid(session);
if (remoteHwid == null) {
c.disconnect(true, false);

2
src/net/server/channel/handlers/TakeDamageHandler.java
View File

@@ -213,7 +213,7 @@ public final class TakeDamageHandler extends AbstractMaplePacketHandler {
map.broadcastMessage(chr, MaplePacketCreator.damageMonster(oid, bouncedamage), false, true);
attacker.aggroMonsterDamage(chr, bouncedamage);
}
MapleStatEffect bPressure = chr.getBuffEffect(MapleBuffStat.BODY_PRESSURE);
MapleStatEffect bPressure = chr.getBuffEffect(MapleBuffStat.BODY_PRESSURE); // thanks Atoot for noticing an issue on Body Pressure neutralise
if (bPressure != null) {
Skill skill = SkillFactory.getSkill(Aran.BODY_PRESSURE);
if (!attacker.alreadyBuffedStats().contains(MonsterStatus.NEUTRALISE)) {

23
src/net/server/coordinator/login/LoginStorage.java
View File

@@ -37,21 +37,20 @@ public class LoginStorage {
private ConcurrentHashMap<Integer, List<Long>> loginHistory = new ConcurrentHashMap<>();
public boolean registerLogin(int accountId) {
List<Long> accHist = loginHistory.putIfAbsent(accountId, new LinkedList<Long>());
if (accHist != null) {
synchronized (accHist) {
if (accHist.size() > YamlConfig.config.server.MAX_ACCOUNT_LOGIN_ATTEMPT) {
long blockExpiration = Server.getInstance().getCurrentTime() + YamlConfig.config.server.LOGIN_ATTEMPT_DURATION;
Collections.fill(accHist, blockExpiration);
return false;
}
}
} else {
accHist = loginHistory.get(accountId);
List<Long> accHist = loginHistory.get(accountId);
if (accHist == null) {
accHist = new LinkedList<Long>();
loginHistory.put(accountId, accHist);
}
synchronized (accHist) {
if (accHist.size() > YamlConfig.config.server.MAX_ACCOUNT_LOGIN_ATTEMPT) {
long blockExpiration = Server.getInstance().getCurrentTime() + YamlConfig.config.server.LOGIN_ATTEMPT_DURATION;
Collections.fill(accHist, blockExpiration);
return false;
}
accHist.add(Server.getInstance().getCurrentTime() + YamlConfig.config.server.LOGIN_ATTEMPT_DURATION);
return true;
}

15
src/net/server/coordinator/partysearch/MaplePartySearchCoordinator.java
View File

@@ -25,8 +25,6 @@ import config.YamlConfig;
import java.io.File;
import net.server.world.MapleParty;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import net.server.coordinator.partysearch.PartySearchEchelon;
import net.server.coordinator.partysearch.PartySearchStorage;
import tools.MaplePacketCreator;
import tools.Pair;
@@ -38,11 +36,12 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReadLock;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import net.server.coordinator.world.MapleInviteCoordinator;
import provider.MapleData;
import provider.MapleDataProviderFactory;
@@ -58,9 +57,9 @@ public class MaplePartySearchCoordinator {
private Map<MapleJob, PartySearchEchelon> upcomers = new HashMap<>();
private List<MapleCharacter> leaderQueue = new LinkedList<>();
private final ReentrantReadWriteLock leaderQueueLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.WORLD_PARTY_SEARCH_QUEUE, true);
private final ReadLock leaderQueueRLock = leaderQueueLock.readLock();
private final WriteLock leaderQueueWLock = leaderQueueLock.writeLock();
private final MonitoredReentrantReadWriteLock leaderQueueLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.WORLD_PARTY_SEARCH_QUEUE, true);
private final MonitoredReadLock leaderQueueRLock = MonitoredReadLockFactory.createLock(leaderQueueLock);
private final MonitoredWriteLock leaderQueueWLock = MonitoredWriteLockFactory.createLock(leaderQueueLock);
private Map<Integer, MapleCharacter> searchLeaders = new HashMap<>();
private Map<Integer, LeaderSearchMetadata> searchSettings = new HashMap<>();

14
src/net/server/coordinator/partysearch/PartySearchEchelon.java
View File

@@ -25,12 +25,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReadLock;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import java.lang.ref.WeakReference;
@@ -40,9 +40,9 @@ import java.lang.ref.WeakReference;
*/
public class PartySearchEchelon {
private final ReentrantReadWriteLock psLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.WORLD_PARTY_SEARCH_ECHELON, true);
private final ReadLock psRLock = psLock.readLock();
private final WriteLock psWLock = psLock.writeLock();
private final MonitoredReentrantReadWriteLock psLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.WORLD_PARTY_SEARCH_ECHELON, true);
private final MonitoredReadLock psRLock = MonitoredReadLockFactory.createLock(psLock);
private final MonitoredWriteLock psWLock = MonitoredWriteLockFactory.createLock(psLock);
private Map<Integer, WeakReference<MapleCharacter>> echelon = new HashMap<>(20);

14
src/net/server/coordinator/partysearch/PartySearchStorage.java
View File

@@ -28,12 +28,14 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReadLock;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import tools.IntervalBuilder;
/**
@@ -45,9 +47,9 @@ public class PartySearchStorage {
private List<PartySearchCharacter> storage = new ArrayList<>(20);
private IntervalBuilder emptyIntervals = new IntervalBuilder();
private final ReentrantReadWriteLock psLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.WORLD_PARTY_SEARCH_STORAGE, true);
private final ReadLock psRLock = psLock.readLock();
private final WriteLock psWLock = psLock.writeLock();
private final MonitoredReentrantReadWriteLock psLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.WORLD_PARTY_SEARCH_STORAGE, true);
private final MonitoredReadLock psRLock = MonitoredReadLockFactory.createLock(psLock);
private final MonitoredWriteLock psWLock = MonitoredWriteLockFactory.createLock(psLock);
public List<PartySearchCharacter> getStorageList() {
psRLock.lock();

2
src/net/server/handlers/login/CharlistRequestHandler.java
View File

@@ -44,7 +44,7 @@ public final class CharlistRequestHandler extends AbstractMaplePacketHandler {
int channel = slea.readByte() + 1;
Channel ch = wserv.getChannel(channel);
if(ch == null || !ch.isActive()) {
if(ch == null) {
c.announce(MaplePacketCreator.getServerStatus(2));
return;
}

1
src/net/server/handlers/login/LoginPasswordHandler.java
View File

@@ -150,6 +150,7 @@ public final class LoginPasswordHandler implements MaplePacketHandler {
return;
}
if (c.finishLogin() == 0) {
c.checkChar(c.getAccID());
login(c);
} else {
c.announce(MaplePacketCreator.getLoginFailed(7));

2
src/net/server/channel/services/BaseScheduler.java → src/net/server/services/BaseScheduler.java
View File

@@ -17,7 +17,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services;
package net.server.services;
import config.YamlConfig;
import java.util.Collections;

2
src/net/server/channel/services/task/BaseService.java → src/net/server/services/BaseService.java
View File

@@ -17,7 +17,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services.task;
package net.server.services;
import config.YamlConfig;

2
src/net/server/channel/services/SchedulerListener.java → src/net/server/services/SchedulerListener.java
View File

@@ -17,7 +17,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services;
package net.server.services;
import java.util.List;

4
src/net/server/channel/services/Service.java → src/net/server/services/Service.java
View File

@@ -17,9 +17,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services;
import net.server.channel.services.task.BaseService;
package net.server.services;
/**
*

30
src/net/server/services/ServiceType.java Normal file
View File

@@ -0,0 +1,30 @@
/*
This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
Copyleft (L) 2016 - 2019 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation version 3 as published by
the Free Software Foundation. You may not use, modify or distribute
this program under any other version of the GNU Affero General Public
License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.services;
/**
*
* @author Ronan
*/
public interface ServiceType <T extends Enum<?>> {
public abstract Service createService();
public int ordinal();
public T[] enumValues();
}

12
src/net/server/channel/services/ServicesManager.java → src/net/server/services/ServicesManager.java
View File

@@ -17,7 +17,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services;
package net.server.services;
/**
*
@@ -27,12 +27,12 @@ public class ServicesManager {
private Service[] services;
public ServicesManager() {
ServiceType[] serviceTypes = ServiceType.values();
public ServicesManager(ServiceType serviceBundle) {
Enum[] serviceTypes = serviceBundle.enumValues();
services = new Service[serviceTypes.length];
for (ServiceType type : serviceTypes) {
services[type.ordinal()] = type.createService();
for (Enum type : serviceTypes) {
services[type.ordinal()] = ((ServiceType) type).createService();
}
}
@@ -41,7 +41,7 @@ public class ServicesManager {
}
public void shutdown() {
for (int i = 0; i < ServiceType.values().length; i++) {
for (int i = 0; i < services.length; i++) {
services[i].dispose();
}
services = null;

6
src/net/server/channel/services/task/EventService.java → src/net/server/services/task/channel/EventService.java
View File

@@ -17,11 +17,12 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services.task;
package net.server.services.task.channel;
import net.server.services.BaseService;
import config.YamlConfig;
import net.server.audit.locks.MonitoredLockType;
import net.server.channel.services.BaseScheduler;
import net.server.services.BaseScheduler;
/**
*
@@ -37,6 +38,7 @@ public class EventService extends BaseService {
}
}
@Override
public void dispose() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {
if(eventSchedulers[i] != null) {

6
src/net/server/channel/services/task/FaceExpressionService.java → src/net/server/services/task/channel/FaceExpressionService.java
View File

@@ -17,8 +17,9 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services.task;
package net.server.services.task.channel;
import net.server.services.BaseService;
import client.MapleCharacter;
import config.YamlConfig;
import java.util.Collections;
@@ -26,7 +27,7 @@ import net.server.audit.LockCollector;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.channel.services.BaseScheduler;
import net.server.services.BaseScheduler;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
@@ -61,6 +62,7 @@ public class FaceExpressionService extends BaseService {
});
}
@Override
public void dispose() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {
if(faceExpressionSchedulers[i] != null) {

8
src/net/server/channel/services/task/MobAnimationService.java → src/net/server/services/task/channel/MobAnimationService.java
View File

@@ -17,8 +17,9 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services.task;
package net.server.services.task.channel;
import net.server.services.BaseService;
import config.YamlConfig;
import net.server.audit.locks.MonitoredLockType;
@@ -28,8 +29,8 @@ import java.util.Set;
import net.server.audit.LockCollector;
import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.channel.services.BaseScheduler;
import net.server.channel.services.SchedulerListener;
import net.server.services.BaseScheduler;
import net.server.services.SchedulerListener;
/**
*
@@ -45,6 +46,7 @@ public class MobAnimationService extends BaseService {
}
}
@Override
public void dispose() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {
if(mobAnimationSchedulers[i] != null) {

6
src/net/server/channel/services/task/MobClearSkillService.java → src/net/server/services/task/channel/MobClearSkillService.java
View File

@@ -17,11 +17,12 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services.task;
package net.server.services.task.channel;
import net.server.services.BaseService;
import config.YamlConfig;
import net.server.audit.locks.MonitoredLockType;
import net.server.channel.services.BaseScheduler;
import net.server.services.BaseScheduler;
/**
*
@@ -37,6 +38,7 @@ public class MobClearSkillService extends BaseService {
}
}
@Override
public void dispose() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {
if(mobClearSkillSchedulers[i] != null) {

6
src/net/server/channel/services/task/MobMistService.java → src/net/server/services/task/channel/MobMistService.java
View File

@@ -17,11 +17,12 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services.task;
package net.server.services.task.channel;
import net.server.services.BaseService;
import config.YamlConfig;
import net.server.audit.locks.MonitoredLockType;
import net.server.channel.services.BaseScheduler;
import net.server.services.BaseScheduler;
/**
*
@@ -37,6 +38,7 @@ public class MobMistService extends BaseService {
}
}
@Override
public void dispose() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {
if(mobMistSchedulers[i] != null) {

8
src/net/server/channel/services/task/MobStatusService.java → src/net/server/services/task/channel/MobStatusService.java
View File

@@ -17,8 +17,9 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services.task;
package net.server.services.task.channel;
import net.server.services.BaseService;
import client.status.MonsterStatusEffect;
import config.YamlConfig;
import java.util.HashMap;
@@ -29,8 +30,8 @@ import net.server.audit.LockCollector;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.channel.services.BaseScheduler;
import net.server.channel.services.SchedulerListener;
import net.server.services.BaseScheduler;
import net.server.services.SchedulerListener;
/**
*
@@ -46,6 +47,7 @@ public class MobStatusService extends BaseService {
}
}
@Override
public void dispose() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {
if(mobStatusSchedulers[i] != null) {

6
src/net/server/channel/services/task/OverallService.java → src/net/server/services/task/channel/OverallService.java
View File

@@ -17,11 +17,12 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services.task;
package net.server.services.task.channel;
import net.server.services.BaseService;
import config.YamlConfig;
import net.server.audit.locks.MonitoredLockType;
import net.server.channel.services.BaseScheduler;
import net.server.services.BaseScheduler;
/**
*
@@ -37,6 +38,7 @@ public class OverallService extends BaseService { // thanks Alex for suggestin
}
}
@Override
public void dispose() {
for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {
if(channelSchedulers[i] != null) {

62
src/net/server/services/task/world/CharacterSaveService.java Normal file
View File

@@ -0,0 +1,62 @@
/*
This file is part of the HeavenMS MapleStory Server
Copyleft (L) 2016 - 2018 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation version 3 as published by
the Free Software Foundation. You may not use, modify or distribute
this program under any other version of the GNU Affero General Public
License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.services.task.world;
import net.server.audit.locks.MonitoredLockType;
import net.server.services.BaseScheduler;
import net.server.services.BaseService;
/**
*
* @author Ronan
*/
public class CharacterSaveService extends BaseService {
CharacterSaveScheduler chrSaveScheduler = new CharacterSaveScheduler();
@Override
public void dispose() {
if(chrSaveScheduler != null) {
chrSaveScheduler.dispose();
chrSaveScheduler = null;
}
}
public void registerSaveCharacter(int characterId, Runnable runAction) {
chrSaveScheduler.registerSaveCharacter(characterId, runAction);
}
private class CharacterSaveScheduler extends BaseScheduler {
public CharacterSaveScheduler() {
super(MonitoredLockType.WORLD_SAVECHARS);
}
public void registerSaveCharacter(Integer characterId, Runnable runAction) {
registerEntry(characterId, runAction, 0);
}
public void unregisterSaveCharacter(Integer characterId) {
interruptEntry(characterId);
}
}
}

63
src/net/server/services/type/ChannelServices.java Normal file
View File

@@ -0,0 +1,63 @@
/*
This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
Copyleft (L) 2016 - 2019 RonanLana
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation version 3 as published by
the Free Software Foundation. You may not use, modify or distribute
this program under any other version of the GNU Affero General Public
License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.services.type;
import net.server.services.ServiceType;
import net.server.services.task.channel.EventService;
import net.server.services.task.channel.FaceExpressionService;
import net.server.services.task.channel.MobAnimationService;
import net.server.services.task.channel.MobClearSkillService;
import net.server.services.task.channel.MobMistService;
import net.server.services.task.channel.MobStatusService;
import net.server.services.task.channel.OverallService;
import net.server.services.BaseService;
import net.server.services.Service;
/**
*
* @author Ronan
*/
public enum ChannelServices implements ServiceType {
MOB_STATUS(MobStatusService.class),
MOB_ANIMATION(MobAnimationService.class),
MOB_CLEAR_SKILL(MobClearSkillService.class),
MOB_MIST(MobMistService.class),
FACE_EXPRESSION(FaceExpressionService.class),
EVENT(EventService.class),
OVERALL(OverallService.class);
private Class<? extends BaseService> s;
private ChannelServices(Class<? extends BaseService> service) {
s = service;
}
@Override
public Service createService() {
return new Service(s);
}
@Override
public ChannelServices[] enumValues() {
return ChannelServices.values();
}
}

25
src/net/server/channel/services/ServiceType.java → src/net/server/services/type/WorldServices.java
View File

@@ -17,32 +17,35 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.server.channel.services;
package net.server.services.type;
import net.server.channel.services.task.*;
import net.server.services.ServiceType;
import net.server.services.BaseService;
import net.server.services.Service;
import net.server.services.task.world.CharacterSaveService;
/**
*
* @author Ronan
*/
public enum ServiceType {
public enum WorldServices implements ServiceType {
MOB_STATUS(MobStatusService.class),
MOB_ANIMATION(MobAnimationService.class),
MOB_CLEAR_SKILL(MobClearSkillService.class),
MOB_MIST(MobMistService.class),
FACE_EXPRESSION(FaceExpressionService.class),
EVENT(EventService.class),
OVERALL(OverallService.class);
SAVE_CHARACTER(CharacterSaveService.class);
private Class<? extends BaseService> s;
private ServiceType(Class<? extends BaseService> service) {
private WorldServices(Class<? extends BaseService> service) {
s = service;
}
@Override
public Service createService() {
return new Service(s);
}
@Override
public WorldServices[] enumValues() {
return WorldServices.values();
}
}

33
src/net/server/world/World.java
View File

@@ -29,7 +29,6 @@ import client.MapleCharacter;
import client.MapleFamily;
import config.YamlConfig;
import constants.game.GameConstants;
import constants.net.ServerConstants;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -50,9 +49,6 @@ import java.util.SortedMap;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import java.util.Set;
import java.util.HashSet;
@@ -74,9 +70,13 @@ import net.server.PlayerStorage;
import net.server.Server;
import net.server.audit.LockCollector;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReadLock;
import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import net.server.channel.Channel;
import net.server.channel.CharacterIdChannelPair;
import net.server.coordinator.world.MapleInviteCoordinator;
@@ -87,6 +87,9 @@ import net.server.coordinator.partysearch.MaplePartySearchCoordinator;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter;
import net.server.guild.MapleGuildSummary;
import net.server.services.BaseService;
import net.server.services.ServicesManager;
import net.server.services.type.WorldServices;
import net.server.task.CharacterAutosaverTask;
import net.server.task.FamilyDailyResetTask;
import net.server.task.FishingTask;
@@ -123,12 +126,13 @@ public class World {
private Map<Integer, Pair<Integer, Integer>> relationshipCouples = new HashMap<>();
private Map<Integer, MapleGuildSummary> gsStore = new HashMap<>();
private PlayerStorage players = new PlayerStorage();
private ServicesManager services = new ServicesManager(WorldServices.SAVE_CHARACTER);
private MapleMatchCheckerCoordinator matchChecker = new MapleMatchCheckerCoordinator();
private MaplePartySearchCoordinator partySearch = new MaplePartySearchCoordinator();
private final ReentrantReadWriteLock chnLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.WORLD_CHANNELS, true);
private ReadLock chnRLock = chnLock.readLock();
private WriteLock chnWLock = chnLock.writeLock();
private final MonitoredReentrantReadWriteLock chnLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.WORLD_CHANNELS, true);
private MonitoredReadLock chnRLock = MonitoredReadLockFactory.createLock(chnLock);
private MonitoredWriteLock chnWLock = MonitoredWriteLockFactory.createLock(chnLock);
private Map<Integer, SortedMap<Integer, MapleCharacter>> accountChars = new HashMap<>();
private Map<Integer, MapleStorage> accountStorages = new HashMap<>();
@@ -145,9 +149,9 @@ public class World {
private Map<Integer, Integer> owlSearched = new LinkedHashMap<>();
private List<Map<Integer, Integer>> cashItemBought = new ArrayList<>(9);
private final ReentrantReadWriteLock suggestLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.WORLD_SUGGEST, true);
private ReadLock suggestRLock = suggestLock.readLock();
private WriteLock suggestWLock = suggestLock.writeLock();
private final MonitoredReentrantReadWriteLock suggestLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.WORLD_SUGGEST, true);
private MonitoredReadLock suggestRLock = MonitoredReadLockFactory.createLock(suggestLock);
private MonitoredWriteLock suggestWLock = MonitoredWriteLockFactory.createLock(suggestLock);
private Map<Integer, Integer> disabledServerMessages = new HashMap<>(); // reuse owl lock
private MonitoredReentrantLock srvMessagesLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.WORLD_SRVMESSAGES);
@@ -2064,6 +2068,14 @@ public class World {
partySearch.runPartySearch();
}
public BaseService getServiceAccess(WorldServices sv) {
return services.getAccess(sv).getService();
}
private void closeWorldServices() {
services.shutdown();
}
private void clearWorldData() {
List<MapleParty> pList;
partyLock.lock();
@@ -2077,6 +2089,7 @@ public class World {
p.disposeLocks();
}
closeWorldServices();
disposeLocks();
}