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

Login Purification + Optimized currenttime calls + Standardized WZ

Browse Source 
Repelled ultimately the game-breaking issue that was introduced recently on the revamp of the login phase.
Optimized the getcurrenttime calls to the OS. Made most of the handler calls fetch directly from the Server object instead, the Server itself delegated with periodically updating the current time value. The result is an slightly delayed currenttime, backed with realtime value update within minutes.
Protected concurrently inventory sort handlers. Expected no more NullPointers from the sorting feature.
Added a server flag to limit cash items being sold on player shops/hired merchants.
Stabilized the MapleTV mechanics, and activities properly split by world.
Normalized Character.wz: equipments supposed to have the "cash" property now implements it.
Normalized String.wz: every item that doesn't have a "name" property now implements it.
Normalized the XMLs that lost indentation on the last source update.
New tool: MapleInvalidItemWithNoNameFetcher. Fetches and reports itemids throughout the XMLs that doesn't contain the "name" property and equipments that lacks "cash" property.

Frolic Omniknight references aside, if you have run into any more issues regarding the new login system, please open an issue and show the steps you've done to reach the problem.
This commit is contained in:
ronancpl
2018-07-18 13:00:53 -03:00
parent ad812de001
commit f439c158e2
252 changed files with 93423 additions and 1459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/server/channel/Channel.java
+40
View File
@@ -89,6 +89,7 @@ public final class Channel {
private EventScriptManager eventSM;
private MobStatusScheduler mobStatusSchedulers[] = new MobStatusScheduler[4];
private MobAnimationScheduler mobAnimationSchedulers[] = new MobAnimationScheduler[4];
private FaceExpressionScheduler faceExpressionSchedulers[] = new FaceExpressionScheduler[4];
private OverallScheduler channelSchedulers[] = new OverallScheduler[4];
private Map<Integer, MapleHiredMerchant> hiredMerchants = new HashMap<>();
private final Map<Integer, Integer> storedVars = new HashMap<>();
@@ -120,6 +121,8 @@ public final class Channel {
private ReadLock merchRlock = merchantLock.readLock();
private WriteLock merchWlock = merchantLock.writeLock();
private Lock faceLock[] = new MonitoredReentrantLock[4];
private Lock lock = new MonitoredReentrantLock(MonitoredLockType.CHANNEL, true);
public Channel(final int world, final int channel, long startTime) {
@@ -157,8 +160,11 @@ public final class Channel {
}
for(int i = 0; i < 4; i++) {
faceLock[i] = new MonitoredReentrantLock(MonitoredLockType.CHANNEL_FACEEXPRS, true);
mobStatusSchedulers[i] = new MobStatusScheduler();
mobAnimationSchedulers[i] = new MobAnimationScheduler();
faceExpressionSchedulers[i] = new FaceExpressionScheduler(faceLock[i]);
channelSchedulers[i] = new OverallScheduler();
}
@@ -870,6 +876,40 @@ public final class Channel {
channelSchedulers[getChannelSchedulerIndex(mapid)].forceRunDelayedAction(runAction);
}
public void registerFaceExpression(final MapleMap map, final MapleCharacter chr, int emote) {
int lockid = getChannelSchedulerIndex(map.getId());
Runnable cancelAction = new Runnable() {
@Override
public void run() {
if(chr.isLoggedinWorld()) {
map.broadcastMessage(chr, MaplePacketCreator.facialExpression(chr, 0), false);
}
}
};
faceLock[lockid].lock();
try {
if(chr.isLoggedinWorld()) {
faceExpressionSchedulers[lockid].registerFaceExpression(chr.getId(), cancelAction);
map.broadcastMessage(chr, MaplePacketCreator.facialExpression(chr, emote), false);
}
} finally {
faceLock[lockid].unlock();
}
}
public void unregisterFaceExpression(int mapid, MapleCharacter chr) {
int lockid = getChannelSchedulerIndex(mapid);
faceLock[lockid].lock();
try {
faceExpressionSchedulers[lockid].unregisterFaceExpression(chr.getId());
} finally {
faceLock[lockid].unlock();
}
}
public void debugMarriageStatus() {
System.out.println(" ----- WORLD DATA -----");
Server.getInstance().getWorld(world).debugMarriageStatus();
src/net/server/channel/handlers/AranComboHandler.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class AranComboHandler extends AbstractMaplePacketHandler {
final MapleCharacter player = c.getPlayer();
int skillLevel = player.getSkillLevel(SkillFactory.getSkill(Aran.COMBO_ABILITY));
if (GameConstants.isAran(player.getJob().getId()) && (skillLevel > 0 || player.getJob().getId() == 2000)) {
final long currentTime = System.currentTimeMillis();
final long currentTime = currentServerTime();
short combo = player.getCombo();
if ((currentTime - player.getLastCombo()) > 3000 && combo > 0) {
combo = 0;
src/net/server/channel/handlers/BBSOperationHandler.java
+3 -3
View File
@@ -133,7 +133,7 @@ public final class BBSOperationHandler extends AbstractMaplePacketHandler {
ps = con.prepareStatement("INSERT INTO bbs_replies " + "(`threadid`, `postercid`, `timestamp`, `content`) VALUES " + "(?, ?, ?, ?)");
ps.setInt(1, threadid);
ps.setInt(2, c.getPlayer().getId());
ps.setLong(3, System.currentTimeMillis());
ps.setLong(3, currentServerTime());
ps.setString(4, text);
ps.execute();
ps.close();
@@ -157,7 +157,7 @@ public final class BBSOperationHandler extends AbstractMaplePacketHandler {
Connection con = DatabaseConnection.getConnection();
try (PreparedStatement ps = con.prepareStatement("UPDATE bbs_threads SET `name` = ?, `timestamp` = ?, " + "`icon` = ?, " + "`startpost` = ? WHERE guildid = ? AND localthreadid = ? AND (postercid = ? OR ?)")) {
ps.setString(1, title);
ps.setLong(2, System.currentTimeMillis());
ps.setLong(2, currentServerTime());
ps.setInt(3, icon);
ps.setString(4, text);
ps.setInt(5, c.getGuildId());
@@ -194,7 +194,7 @@ public final class BBSOperationHandler extends AbstractMaplePacketHandler {
ps = con.prepareStatement("INSERT INTO bbs_threads " + "(`postercid`, `name`, `timestamp`, `icon`, `startpost`, " + "`guildid`, `localthreadid`) " + "VALUES(?, ?, ?, ?, ?, ?, ?)");
ps.setInt(1, c.getId());
ps.setString(2, title);
ps.setLong(3, System.currentTimeMillis());
ps.setLong(3, currentServerTime());
ps.setInt(4, icon);
ps.setString(5, text);
ps.setInt(6, c.getGuildId());
src/net/server/channel/handlers/ChangeMapSpecialHandler.java
+1 -1
View File
@@ -35,7 +35,7 @@ public final class ChangeMapSpecialHandler extends AbstractMaplePacketHandler {
String startwp = slea.readMapleAsciiString();
slea.readShort();
MaplePortal portal = c.getPlayer().getMap().getPortal(startwp);
if (portal == null || c.getPlayer().portalDelay() > System.currentTimeMillis() || c.getPlayer().getBlockedPortals().contains(portal.getScriptName())) {
if (portal == null || c.getPlayer().portalDelay() > currentServerTime() || c.getPlayer().getBlockedPortals().contains(portal.getScriptName())) {
c.announce(MaplePacketCreator.enableActions());
return;
}
src/net/server/channel/handlers/CloseRangeDamageHandler.java
+4 -4
View File
@@ -50,9 +50,9 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
MapleCharacter chr = c.getPlayer();
chr.setPetLootCd(System.currentTimeMillis());
chr.setPetLootCd(currentServerTime());
/*long timeElapsed = System.currentTimeMillis() - chr.getAutobanManager().getLastSpam(8);
/*long timeElapsed = currentServerTime() - chr.getAutobanManager().getLastSpam(8);
if(timeElapsed < 300) {
AutobanFactory.FAST_ATTACK.alert(chr, "Time: " + timeElapsed);
}
@@ -115,7 +115,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
int duration = combo.getEffect(olv).getDuration();
List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.COMBO, neworbcount));
chr.setBuffedValue(MapleBuffStat.COMBO, neworbcount);
duration -= (int) (System.currentTimeMillis() - chr.getBuffedStarttime(MapleBuffStat.COMBO));
duration -= (int) (currentServerTime() - chr.getBuffedStarttime(MapleBuffStat.COMBO));
c.announce(MaplePacketCreator.giveBuff(oid, duration, stat));
chr.getMap().broadcastMessage(chr, MaplePacketCreator.giveForeignBuff(chr.getId(), stat), false);
}
@@ -174,7 +174,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
return;
} else {
c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));
chr.addCooldown(attack.skill, System.currentTimeMillis(), effect_.getCooldown() * 1000);
chr.addCooldown(attack.skill, currentServerTime(), effect_.getCooldown() * 1000);
}
}
}
src/net/server/channel/handlers/CoconutHandler.java
+1 -1
View File
@@ -50,7 +50,7 @@ public final class CoconutHandler extends AbstractMaplePacketHandler {
if (event == null){
return;
}
if (System.currentTimeMillis() < nut.getHitTime()){
if (currentServerTime() < nut.getHitTime()){
return;
}
if (nut.getHits() > 2 && Math.random() < 0.4) {
src/net/server/channel/handlers/FaceExpressionHandler.java
+14 -3
View File
@@ -22,21 +22,32 @@
package net.server.channel.handlers;
import client.MapleClient;
import client.MapleCharacter;
import constants.ItemConstants;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class FaceExpressionHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
MapleCharacter chr = c.getPlayer();
int emote = slea.readInt();
if (emote > 7) {
int emoteid = 5159992 + emote;
if (c.getPlayer().getInventory(ItemConstants.getInventoryType(emoteid)).findById(emoteid) == null) {
if (chr.getInventory(ItemConstants.getInventoryType(emoteid)).findById(emoteid) == null) {
return;
}
}
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.facialExpression(c.getPlayer(), emote), false);
if(c.trylockClient()) {
try { // expecting players never intends to wear the emote 0 (default face, that changes back after 5sec timeout)
if (emote != 0 && chr.isLoggedinWorld()) {
chr.changeFaceExpression(emote);
}
} finally {
c.unlockClient();
}
}
}
}
src/net/server/channel/handlers/GeneralChatHandler.java
+1 -1
View File
@@ -45,7 +45,7 @@ public final class GeneralChatHandler extends AbstractMaplePacketHandler {
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
String s = slea.readMapleAsciiString();
MapleCharacter chr = c.getPlayer();
if(chr.getAutobanManager().getLastSpam(7) + 200 > System.currentTimeMillis()) {
if(chr.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
c.announce(MaplePacketCreator.enableActions());
return;
}
src/net/server/channel/handlers/GuildOperationHandler.java
+5 -5
View File
@@ -60,7 +60,7 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
public Invited(String n, int id) {
name = n.toLowerCase();
gid = id;
expiration = System.currentTimeMillis() + 60 * 60 * 1000;
expiration = currentServerTime() + 60 * 60 * 1000;
}
@Override
@@ -81,20 +81,20 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
}
}
private java.util.List<Invited> invited = new java.util.LinkedList<Invited>();
private long nextPruneTime = System.currentTimeMillis() + 20 * 60 * 1000;
private long nextPruneTime = currentServerTime() + 20 * 60 * 1000;
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
if (System.currentTimeMillis() >= nextPruneTime) {
if (currentServerTime() >= nextPruneTime) {
Iterator<Invited> itr = invited.iterator();
Invited inv;
while (itr.hasNext()) {
inv = itr.next();
if (System.currentTimeMillis() >= inv.expiration) {
if (currentServerTime() >= inv.expiration) {
itr.remove();
}
}
nextPruneTime = System.currentTimeMillis() + 20 * 60 * 1000;
nextPruneTime = currentServerTime() + 20 * 60 * 1000;
}
MapleCharacter mc = c.getPlayer();
byte type = slea.readByte();
src/net/server/channel/handlers/InventoryMergeHandler.java
+40 -35
View File
@@ -47,52 +47,57 @@ public final class InventoryMergeHandler extends AbstractMaplePacketHandler {
}
MapleInventory inventory = c.getPlayer().getInventory(inventoryType);
inventory.lockInventory();
try {
//------------------- RonanLana's SLOT MERGER -----------------
//------------------- RonanLana's SLOT MERGER -----------------
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
Item srcItem, dstItem;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
Item srcItem, dstItem;
for(short dst = 1; dst <= inventory.getSlotLimit(); dst++) {
dstItem = inventory.getItem(dst);
if(dstItem == null) continue;
for(short dst = 1; dst <= inventory.getSlotLimit(); dst++) {
dstItem = inventory.getItem(dst);
if(dstItem == null) continue;
for(short src = (short)(dst + 1); src <= inventory.getSlotLimit(); src++) {
srcItem = inventory.getItem(src);
if(srcItem == null) continue;
for(short src = (short)(dst + 1); src <= inventory.getSlotLimit(); src++) {
srcItem = inventory.getItem(src);
if(srcItem == null) continue;
if(dstItem.getItemId() != srcItem.getItemId()) continue;
if(dstItem.getQuantity() == ii.getSlotMax(c, inventory.getItem(dst).getItemId())) break;
if(dstItem.getItemId() != srcItem.getItemId()) continue;
if(dstItem.getQuantity() == ii.getSlotMax(c, inventory.getItem(dst).getItemId())) break;
MapleInventoryManipulator.move(c, inventoryType, src, dst);
}
}
//------------------------------------------------------------
inventory = c.getPlayer().getInventory(inventoryType);
boolean sorted = false;
while (!sorted) {
short freeSlot = inventory.getNextFreeSlot();
if (freeSlot != -1) {
short itemSlot = -1;
for (short i = (short) (freeSlot + 1); i <= inventory.getSlotLimit(); i = (short) (i + 1)) {
if (inventory.getItem(i) != null) {
itemSlot = i;
break;
}
MapleInventoryManipulator.move(c, inventoryType, src, dst);
}
if (itemSlot > 0) {
MapleInventoryManipulator.move(c, inventoryType, itemSlot, freeSlot);
}
//------------------------------------------------------------
inventory = c.getPlayer().getInventory(inventoryType);
boolean sorted = false;
while (!sorted) {
short freeSlot = inventory.getNextFreeSlot();
if (freeSlot != -1) {
short itemSlot = -1;
for (short i = (short) (freeSlot + 1); i <= inventory.getSlotLimit(); i = (short) (i + 1)) {
if (inventory.getItem(i) != null) {
itemSlot = i;
break;
}
}
if (itemSlot > 0) {
MapleInventoryManipulator.move(c, inventoryType, itemSlot, freeSlot);
} else {
sorted = true;
}
} else {
sorted = true;
}
} else {
sorted = true;
}
} finally {
inventory.unlockInventory();
}
c.announce(MaplePacketCreator.finishedSort(inventoryType.getType()));
c.announce(MaplePacketCreator.enableActions());
}
src/net/server/channel/handlers/InventorySortHandler.java
+26 -21
View File
@@ -199,33 +199,38 @@ public final class InventorySortHandler extends AbstractMaplePacketHandler {
c.disconnect(false, false);
return;
}
MapleInventory inventory = chr.getInventory(MapleInventoryType.getByType(inventoryType));
ArrayList<Item> itemarray = new ArrayList<>();
List<ModifyInventory> mods = new ArrayList<>();
for (short i = 1; i <= inventory.getSlotLimit(); i++) {
Item item = inventory.getItem(i);
if (item != null) {
itemarray.add((Item) item.copy());
MapleInventory inventory = chr.getInventory(MapleInventoryType.getByType(inventoryType));
inventory.lockInventory();
try {
for (short i = 1; i <= inventory.getSlotLimit(); i++) {
Item item = inventory.getItem(i);
if (item != null) {
itemarray.add((Item) item.copy());
}
}
for (Item item : itemarray) {
inventory.removeSlot(item.getPosition());
mods.add(new ModifyInventory(3, item));
}
int invTypeCriteria = (MapleInventoryType.getByType(inventoryType) == MapleInventoryType.EQUIP) ? 3 : 1;
int sortCriteria = (ServerConstants.USE_ITEM_SORT_BY_NAME == true) ? 2 : 0;
PairedQuicksort pq = new PairedQuicksort(itemarray, sortCriteria, invTypeCriteria);
for (Item item : itemarray) {
inventory.addItem(item);
mods.add(new ModifyInventory(0, item.copy()));//to prevent crashes
}
itemarray.clear();
} finally {
inventory.unlockInventory();
}
for (Item item : itemarray) {
inventory.removeSlot(item.getPosition());
mods.add(new ModifyInventory(3, item));
}
int invTypeCriteria = (MapleInventoryType.getByType(inventoryType) == MapleInventoryType.EQUIP) ? 3 : 1;
int sortCriteria = (ServerConstants.USE_ITEM_SORT_BY_NAME == true) ? 2 : 0;
PairedQuicksort pq = new PairedQuicksort(itemarray, sortCriteria, invTypeCriteria);
for (Item item : itemarray) {
inventory.addItem(item);
mods.add(new ModifyInventory(0, item.copy()));//to prevent crashes
}
itemarray.clear();
c.announce(MaplePacketCreator.modifyInventory(true, mods));
c.announce(MaplePacketCreator.finishedSort2(inventoryType));
c.announce(MaplePacketCreator.enableActions());
src/net/server/channel/handlers/ItemMoveHandler.java
+1 -1
View File
@@ -36,7 +36,7 @@ public final class ItemMoveHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
slea.skip(4);
if(c.getPlayer().getAutobanManager().getLastSpam(6) + 300 > System.currentTimeMillis()) {
if(c.getPlayer().getAutobanManager().getLastSpam(6) + 300 > currentServerTime()) {
c.announce(MaplePacketCreator.enableActions());
return;
}
src/net/server/channel/handlers/ItemRewardHandler.java
+1 -1
View File
@@ -56,7 +56,7 @@ public final class ItemRewardHandler extends AbstractMaplePacketHandler {
if (ItemConstants.getInventoryType(reward.itemid) == MapleInventoryType.EQUIP) {
final Item item = ii.getEquipById(reward.itemid);
if (reward.period != -1) {
item.setExpiration(System.currentTimeMillis() + (reward.period * 60 * 60 * 10));
item.setExpiration(currentServerTime() + (reward.period * 60 * 60 * 10));
}
MapleInventoryManipulator.addFromDrop(c, item, false);
} else {
src/net/server/channel/handlers/MagicDamageHandler.java
+3 -3
View File
@@ -39,9 +39,9 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
MapleCharacter chr = c.getPlayer();
chr.setPetLootCd(System.currentTimeMillis());
chr.setPetLootCd(currentServerTime());
/*long timeElapsed = System.currentTimeMillis() - chr.getAutobanManager().getLastSpam(8);
/*long timeElapsed = currentServerTime() - chr.getAutobanManager().getLastSpam(8);
if(timeElapsed < 300) {
AutobanFactory.FAST_ATTACK.alert(chr, "Time: " + timeElapsed);
}
@@ -74,7 +74,7 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler {
return;
} else {
c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));
chr.addCooldown(attack.skill, System.currentTimeMillis(), effect_.getCooldown() * 1000);
chr.addCooldown(attack.skill, currentServerTime(), effect_.getCooldown() * 1000);
}
}
applyAttack(attack, chr, effect.getAttackCount());
src/net/server/channel/handlers/MoveLifeHandler.java
+1 -2
View File
@@ -26,7 +26,6 @@ import client.MapleClient;
import java.awt.Point;
import java.util.ArrayList;
import java.util.List;
import net.server.Server;
import server.life.MapleMonster;
import server.life.MapleMonsterInformationProvider;
//import server.life.MobAttackInfo;
@@ -102,7 +101,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
toUse = MobSkillFactory.getMobSkill(nextCastSkill, nextCastSkillLevel);
if (!isSkill && !isAttack) {
long curtime = Server.getInstance().getCurrentTime();
long curtime = currentServerTime();
if(curtime >= monster.getNextBasicSkillTime()) { // dont use the special attack too often, chase the player f3
//MobAttackInfo mobAttack = MobAttackInfoFactory.getMobAttackInfo(monster, attackId);
monster.setNextBasicSkillTime(curtime);
src/net/server/channel/handlers/MultiChatHandler.java
+1 -1
View File
@@ -35,7 +35,7 @@ public final class MultiChatHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
MapleCharacter player = c.getPlayer();
if(player.getAutobanManager().getLastSpam(7) + 200 > System.currentTimeMillis()) {
if(player.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
return;
}
src/net/server/channel/handlers/NPCTalkHandler.java
+2 -2
View File
@@ -41,7 +41,7 @@ public final class NPCTalkHandler extends AbstractMaplePacketHandler {
return;
}
if(System.currentTimeMillis() - c.getPlayer().getNpcCooldown() < ServerConstants.BLOCK_NPC_RACE_CONDT) {
if(currentServerTime() - c.getPlayer().getNpcCooldown() < ServerConstants.BLOCK_NPC_RACE_CONDT) {
c.announce(MaplePacketCreator.enableActions());
return;
}
@@ -53,7 +53,7 @@ public final class NPCTalkHandler extends AbstractMaplePacketHandler {
if(ServerConstants.USE_DEBUG == true) c.getPlayer().dropMessage(5, "Talking to NPC " + npc.getId());
if (npc.getId() == 9010009) { //is duey
c.getPlayer().setNpcCooldown(System.currentTimeMillis());
c.getPlayer().setNpcCooldown(currentServerTime());
DueyProcessor.dueySendTalk(c);
} else {
if (c.getCM() != null || c.getQM() != null) {
src/net/server/channel/handlers/PetFoodHandler.java
+1 -1
View File
@@ -38,7 +38,7 @@ public final class PetFoodHandler extends AbstractMaplePacketHandler {
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
MapleCharacter chr = c.getPlayer();
AutobanManager abm = chr.getAutobanManager();
if (abm.getLastSpam(2) + 500 > System.currentTimeMillis()) {
if (abm.getLastSpam(2) + 500 > currentServerTime()) {
c.announce(MaplePacketCreator.enableActions());
return;
}
src/net/server/channel/handlers/PetLootHandler.java
+1 -1
View File
@@ -42,7 +42,7 @@ public final class PetLootHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
MapleCharacter chr = c.getPlayer();
if(System.currentTimeMillis() - chr.getPetLootCd() < ServerConstants.PET_LOOT_UPON_ATTACK) {
if(currentServerTime() - chr.getPetLootCd() < ServerConstants.PET_LOOT_UPON_ATTACK) {
c.announce(MaplePacketCreator.enableActions());
return;
}
src/net/server/channel/handlers/PlayerInteractionHandler.java
+23 -19
View File
@@ -201,22 +201,20 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(6));
return;
}
if (itemId > 5030000 && itemId < 5030012 || itemId > 5140000 && itemId < 5140006) {
if (createType == 4) {
MaplePlayerShop shop = new MaplePlayerShop(chr, desc);
chr.setPlayerShop(shop);
chr.getMap().addMapObject(shop);
shop.sendShop(c);
c.getWorldServer().registerPlayerShop(shop);
//c.announce(MaplePacketCreator.getPlayerShopRemoveVisitor(1));
} else {
MapleHiredMerchant merchant = new MapleHiredMerchant(chr, itemId, desc);
chr.setHiredMerchant(merchant);
c.getWorldServer().registerHiredMerchant(merchant);
chr.getClient().getChannelServer().addHiredMerchant(chr.getId(), merchant);
chr.announce(MaplePacketCreator.getHiredMerchant(chr, merchant, true));
}
if (ItemConstants.isPlayerShop(itemId)) {
MaplePlayerShop shop = new MaplePlayerShop(chr, desc);
chr.setPlayerShop(shop);
chr.getMap().addMapObject(shop);
shop.sendShop(c);
c.getWorldServer().registerPlayerShop(shop);
//c.announce(MaplePacketCreator.getPlayerShopRemoveVisitor(1));
} else if (ItemConstants.isHiredMerchant(itemId)) {
MapleHiredMerchant merchant = new MapleHiredMerchant(chr, itemId, desc);
chr.setHiredMerchant(merchant);
c.getWorldServer().registerHiredMerchant(merchant);
chr.getClient().getChannelServer().addHiredMerchant(chr.getId(), merchant);
chr.announce(MaplePacketCreator.getHiredMerchant(chr, merchant, true));
}
}
} else if (mode == Action.INVITE.getCode()) {
@@ -473,12 +471,18 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
FilePrinter.printError(FilePrinter.EXPLOITS + chr.getName() + ".txt", chr.getName() + " might of possibly packet edited Hired Merchants\nperBundle: " + perBundle + "\nperBundle * bundles (This multiplied cannot be greater than 2000): " + perBundle * bundles + "\nbundles: " + bundles + "\nprice: " + price);
return;
}
Item sellItem = ivItem.copy();
if (ServerConstants.USE_ENFORCE_UNMERCHABLE_PET && ItemConstants.isPet(ivItem.getItemId())) {
c.announce(MaplePacketCreator.serverNotice(1, "Pets are not allowed to be sold on the Player Shop."));
if(ServerConstants.USE_ENFORCE_UNMERCHABLE_CASH && MapleItemInformationProvider.getInstance().isCash(ivItem.getItemId())) {
c.announce(MaplePacketCreator.serverNotice(1, "Cash items are not allowed to be sold on the Player Store."));
return;
}
if (ServerConstants.USE_ENFORCE_UNMERCHABLE_PET && ItemConstants.isPet(ivItem.getItemId())) {
c.announce(MaplePacketCreator.serverNotice(1, "Pets are not allowed to be sold on the Player Store."));
return;
}
Item sellItem = ivItem.copy();
if(!ItemConstants.isRechargeable(ivItem.getItemId())) {
sellItem.setQuantity(perBundle);
}
src/net/server/channel/handlers/PlayerLoggedinHandler.java
+1 -1
View File
@@ -343,7 +343,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
private static List<Pair<Long, PlayerBuffValueHolder>> getLocalStartTimes(List<PlayerBuffValueHolder> lpbvl) {
List<Pair<Long, PlayerBuffValueHolder>> timedBuffs = new ArrayList<>();
long curtime = System.currentTimeMillis();
long curtime = currentServerTime();
for(PlayerBuffValueHolder pb : lpbvl) {
timedBuffs.add(new Pair<>(curtime - pb.usedTime, pb));
src/net/server/channel/handlers/RangedAttackHandler.java
+3 -3
View File
@@ -51,9 +51,9 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
MapleCharacter chr = c.getPlayer();
chr.setPetLootCd(System.currentTimeMillis());
chr.setPetLootCd(currentServerTime());
/*long timeElapsed = System.currentTimeMillis() - chr.getAutobanManager().getLastSpam(8);
/*long timeElapsed = currentServerTime() - chr.getAutobanManager().getLastSpam(8);
if(timeElapsed < 300) {
AutobanFactory.FAST_ATTACK.alert(chr, "Time: " + timeElapsed);
}
@@ -218,7 +218,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler {
return;
} else {
c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));
chr.addCooldown(attack.skill, System.currentTimeMillis(), effect_.getCooldown() * 1000);
chr.addCooldown(attack.skill, currentServerTime(), effect_.getCooldown() * 1000);
}
}
}
src/net/server/channel/handlers/SnowballHandler.java
+2 -2
View File
@@ -44,10 +44,10 @@ public final class SnowballHandler extends AbstractMaplePacketHandler{
//slea.skip(4);
if (snowball == null || othersnowball == null || snowball.getSnowmanHP() == 0) return;
if ((System.currentTimeMillis() - chr.getLastSnowballAttack()) < 500) return;
if ((currentServerTime() - chr.getLastSnowballAttack()) < 500) return;
if (chr.getTeam() != (what % 2)) return;
chr.setLastSnowballAttack(System.currentTimeMillis());
chr.setLastSnowballAttack(currentServerTime());
int damage = 0;
if (what < 2 && othersnowball.getSnowmanHP() > 0)
damage = 10;
src/net/server/channel/handlers/SpecialMoveHandler.java
+1 -1
View File
@@ -89,7 +89,7 @@ public final class SpecialMoveHandler extends AbstractMaplePacketHandler {
}
c.announce(MaplePacketCreator.skillCooldown(skillid, cooldownTime));
chr.addCooldown(skillid, System.currentTimeMillis(), cooldownTime * 1000);
chr.addCooldown(skillid, currentServerTime(), cooldownTime * 1000);
}
}
if (skillid == Hero.MONSTER_MAGNET || skillid == Paladin.MONSTER_MAGNET || skillid == DarkKnight.MONSTER_MAGNET) { // Monster Magnet
src/net/server/channel/handlers/UseCashItemHandler.java
+11 -9
View File
@@ -67,7 +67,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler {
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
final MapleCharacter player = c.getPlayer();
long timeNow = System.currentTimeMillis();
long timeNow = currentServerTime();
if (timeNow - player.getLastUsedCashItem() < 3000) {
player.dropMessage(1, "You have used a cash item recently. Wait a moment, then try again.");
c.announce(MaplePacketCreator.enableActions());
@@ -310,7 +310,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler {
}
if (period > 0) {
eq.setExpiration(System.currentTimeMillis() + (period * 60 * 60 * 24 * 1000));
eq.setExpiration(currentServerTime() + (period * 60 * 60 * 24 * 1000));
}
remove(c, itemId);
@@ -335,12 +335,13 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler {
}
} else if (itemType == 507) {
boolean whisper;
switch (itemId / 1000 % 10) {
switch ((itemId / 1000) % 10) {
case 1: // Megaphone
if (player.getLevel() > 9) {
player.getClient().getChannelServer().broadcastPacket(MaplePacketCreator.serverNotice(2, medal + player.getName() + " : " + slea.readMapleAsciiString()));
} else {
player.dropMessage(1, "You may not use this until you're level 10.");
return;
}
break;
case 2: // Super megaphone
@@ -375,15 +376,16 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler {
messages.add(message);
}
slea.readInt();
if (megassenger) {
Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(3, c.getChannel(), medal + player.getName() + " : " + builder.toString(), ear));
}
if (!MapleTVEffect.isActive()) {
new MapleTVEffect(player, victim, messages, tvType);
} else {
if (!MapleTVEffect.broadcastMapleTVIfNotActive(player, victim, messages, tvType)) {
player.dropMessage(1, "MapleTV is already in use.");
return;
}
if (megassenger) {
Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(3, c.getChannel(), medal + player.getName() + " : " + builder.toString(), ear));
}
break;
case 6: //item megaphone
String msg = medal + c.getPlayer().getName() + " : " + slea.readMapleAsciiString();
src/net/server/channel/handlers/UseCatchItemHandler.java
+3 -3
View File
@@ -65,7 +65,7 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler {
break;
case 2270001:
if (mob.getId() == 9500197) {
if ((abm.getLastSpam(10) + 1000) < System.currentTimeMillis()) {
if ((abm.getLastSpam(10) + 1000) < currentServerTime()) {
if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
mob.getMap().killMonster(mob, null, false);
@@ -81,7 +81,7 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler {
break;
case 2270002:
if (mob.getId() == 9300157) {
if ((abm.getLastSpam(10) + 800) < System.currentTimeMillis()) {
if ((abm.getLastSpam(10) + 800) < currentServerTime()) {
if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
if (Math.random() < 0.5) { // 50% chance
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
@@ -166,7 +166,7 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler {
break;
case 2270008:
if (mob.getId() == 9500336) {
if ((abm.getLastSpam(10) + 3000) < System.currentTimeMillis()) {
if ((abm.getLastSpam(10) + 3000) < currentServerTime()) {
abm.spam(10);
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
mob.getMap().killMonster(mob, null, false);
src/net/server/channel/handlers/UseItemHandler.java
+1 -1
View File
@@ -74,7 +74,7 @@ public final class UseItemHandler extends AbstractMaplePacketHandler {
} else if (ItemConstants.isTownScroll(itemId)) {
int banMap = chr.getMapId();
int banSp = chr.getMap().findClosestPlayerSpawnpoint(chr.getPosition()).getId();
long banTime = System.currentTimeMillis();
long banTime = currentServerTime();
if (ii.getItemEffect(toUse.getItemId()).applyTo(chr)) {
if(ServerConstants.USE_BANISHABLE_TOWN_SCROLL) {
src/net/server/channel/handlers/UseMapleLifeHandler.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class UseMapleLifeHandler extends AbstractMaplePacketHandler {
@Override
public void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
MapleCharacter player = c.getPlayer();
long timeNow = System.currentTimeMillis();
long timeNow = currentServerTime();
if(timeNow - player.getLastUsedCashItem() < 3000) {
player.dropMessage(5, "Please wait a moment before trying again.");
src/net/server/channel/handlers/WhisperHandler.java
+1 -1
View File
@@ -49,7 +49,7 @@ public final class WhisperHandler extends AbstractMaplePacketHandler {
String recipient = slea.readMapleAsciiString();
String text = slea.readMapleAsciiString();
MapleCharacter player = c.getChannelServer().getPlayerStorage().getCharacterByName(recipient);
if(c.getPlayer().getAutobanManager().getLastSpam(7) + 200 > System.currentTimeMillis()) {
if(c.getPlayer().getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
return;
}
if (text.length() > Byte.MAX_VALUE && !player.isGM()) {
src/net/server/channel/worker/BaseScheduler.java
+34 -6
View File
@@ -40,6 +40,7 @@ import tools.locks.MonitoredReentrantLock;
public abstract class BaseScheduler {
private int idleProcs = 0;
private List<SchedulerListener> listeners = new LinkedList<>();
private final List<Lock> externalLocks;
private Map<Object, Pair<Runnable, Long>> registeredEntries = new HashMap<>();
private ScheduledFuture<?> schedulerTask = null;
@@ -53,16 +54,43 @@ public abstract class BaseScheduler {
protected BaseScheduler(MonitoredLockType lockType) {
schedulerLock = new MonitoredReentrantLock(lockType, true);
externalLocks = new LinkedList<>();
}
// NOTE: practice EXTREME caution when adding external locks to the scheduler system, if you don't know what you're doing DON'T USE THIS.
protected BaseScheduler(MonitoredLockType lockType, List<Lock> extLocks) {
schedulerLock = new MonitoredReentrantLock(lockType, true);
externalLocks = extLocks;
}
protected void addListener(SchedulerListener listener) {
listeners.add(listener);
}
private void lockScheduler() {
if(!externalLocks.isEmpty()) {
for(Lock l : externalLocks) {
l.lock();
}
}
schedulerLock.lock();
}
private void unlockScheduler() {
if(!externalLocks.isEmpty()) {
for(Lock l : externalLocks) {
l.unlock();
}
}
schedulerLock.unlock();
}
private void runBaseSchedule() {
List<Object> toRemove;
schedulerLock.lock();
lockScheduler();
try {
if(registeredEntries.isEmpty()) {
idleProcs++;
@@ -93,14 +121,14 @@ public abstract class BaseScheduler {
registeredEntries.remove(mse);
}
} finally {
schedulerLock.unlock();
unlockScheduler();
}
dispatchRemovedEntries(toRemove, true);
}
protected void registerEntry(Object key, Runnable removalAction, long duration) {
schedulerLock.lock();
lockScheduler();
try {
idleProcs = 0;
if(schedulerTask == null) {
@@ -109,17 +137,17 @@ public abstract class BaseScheduler {
registeredEntries.put(key, new Pair<>(removalAction, System.currentTimeMillis() + duration));
} finally {
schedulerLock.unlock();
unlockScheduler();
}
}
protected void interruptEntry(Object key) {
schedulerLock.lock();
lockScheduler();
try {
Pair<Runnable, Long> rm = registeredEntries.remove(key);
if(rm != null) rm.getLeft().run();
} finally {
schedulerLock.unlock();
unlockScheduler();
}
dispatchRemovedEntries(Collections.singletonList(key), false);
src/net/server/channel/worker/FaceExpressionScheduler.java
+42
View File
@@ -0,0 +1,42 @@
/*
This file is part of the HeavenMS MapleStory Server
Copyleft 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.channel.worker;
import java.util.Collections;
import java.util.concurrent.locks.Lock;
import tools.locks.MonitoredLockType;
/**
*
* @author Ronan
*/
public class FaceExpressionScheduler extends BaseScheduler {
public FaceExpressionScheduler(final Lock channelFaceLock) {
super(MonitoredLockType.CHANNEL_FACESCHDL, Collections.singletonList(channelFaceLock));
}
public void registerFaceExpression(Integer characterId, Runnable runAction) {
registerEntry(characterId, runAction, 5000);
}
public void unregisterFaceExpression(Integer characterId) {
interruptEntry(characterId);
}
}