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

Mob aggro overhaul + STR-DEX autoassign patch + Guild & Pl. Store fix

Browse Source 
Reviewed Monster Magnet skill effect on mobs, now properly showing up to other players.
Reworked concurrency protection on login handler, now properly synchronizing requests for the same accountId.
Reviewed an expedition issue with attempting to send packets on loggedoff players. Expeditions no longer holds a character object list of its own, rather finding players through their id on the world storage.
Added stat requirement definition as first message on 1st job NPCs.
Fixed an issue with area triggered NPC conversations not getting properly disposed.
Reviewed "launch.bat", internally referencing Java7 engine. Assuming it has been installed in the default directory on the system, it's no longer necessary to set precedence on PATH for it.
Fixed need for "reapproval from the 3rd job instructors" to attempt Zakum once more.
Reviewed goto command. Non-GM's no longer has access to area maps, only towns.
Implemented a new server flag for enforcing base rates (server rate: 1x) on players level 10 or lower.
Fixed player guild tooltips not being properly marshalled to others on the map, at the event of several guild actions.
Reviewed event system allowing creation of same-name events, potentially leading to null EIM problems.
Refactored some locks on MapleCharacter, potentially solving a deadlock case within expiring/forfeiting quest methods.
Implemented a major overhaul on mob aggro system, now updating player aggro in real-time based on their latest DPS. Properly refactored and encapsulated aggro mechanics.
Fixed NPE on disposing events with alive mobs.
Added server-side birthday check handling when opening player shops or merchants having cash items in store.
Fixed player shop tooltip not finishing properly when shop owner closes store with visitors still in there.
Fixed forceChangeMap method not warping players to the designated event map (rather sending them to the starting event map).
Reviewed "summon" command, now using forceChangeMap, also changing channels if needed.
Reworked HeavenMS autoassigner: STR-based classes now ups a bit more DEX than before, since its a vital attribute for accuracy on their actions.
Added meso ceil check on player transactions. Trades now gets suspended if the max amount is reached.
Implemented server-side item limit check on player shops and merchants.
Fixed an exploit with merchants, on where players would be able to save the selling item on DB before taking from inventory.
This commit is contained in:
ronancpl
2019-01-31 00:49:15 -02:00
parent 98be29b088
commit efc8884e19
101 changed files with 17235 additions and 16461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/net/server/audit/ThreadTracker.java
View File

@@ -35,7 +35,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import constants.ServerConstants;
import net.server.audit.locks.MonitoredLockType;
import server.TimerManager;
import tools.FilePrinter;

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

@@ -84,6 +84,7 @@ public enum MonitoredLockType {
VISITOR_PSHOP,
STORAGE,
MOB,
MOB_AGGRO,
MOB_ANI,
MOB_EXT,
MOB_STATI,
@@ -96,6 +97,8 @@ public enum MonitoredLockType {
MAP_ITEM,
MAP_LOOT,
MAP_BOUNDS,
MAP_AGGRO,
MAP_AGGRO_IDLE,
MINIDUNGEON,
REACTOR,
REACTOR_HIT;

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

@@ -274,7 +274,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
totDamageToOneMonster += eachd;
}
totDamage += totDamageToOneMonster;
player.checkMonsterAggro(monster);
monster.aggroMonsterDamage(player, totDamageToOneMonster);
if (player.getBuffedValue(MapleBuffStat.PICKPOCKET) != null && (attack.skill == 0 || attack.skill == Rogue.DOUBLE_STAB || attack.skill == Bandit.SAVAGE_BLOW || attack.skill == ChiefBandit.ASSAULTER || attack.skill == ChiefBandit.BAND_OF_THIEVES || attack.skill == Shadower.ASSASSINATE || attack.skill == Shadower.TAUNT || attack.skill == Shadower.BOOMERANG_STEP)) {
Skill pickpocket = SkillFactory.getSkill(ChiefBandit.PICKPOCKET);
int picklv = (player.isGM()) ? pickpocket.getMaxLevel() : player.getSkillLevel(pickpocket);

14
src/net/server/channel/handlers/AbstractMovementPacketHandler.java
View File

@@ -51,11 +51,11 @@ public abstract class AbstractMovementPacketHandler extends AbstractMaplePacketH
short ypos = lea.readShort();
short xwobble = lea.readShort();
short ywobble = lea.readShort();
short unk = lea.readShort();
short fh = lea.readShort();
byte newstate = lea.readByte();
short duration = lea.readShort();
AbsoluteLifeMovement alm = new AbsoluteLifeMovement(command, new Point(xpos, ypos), duration, newstate);
alm.setUnk(unk);
alm.setFh(fh);
alm.setPixelsPerSecond(new Point(xwobble, ywobble));
res.add(alm);
break;
@@ -105,11 +105,11 @@ public abstract class AbstractMovementPacketHandler extends AbstractMaplePacketH
/*case 11: { // Chair
short xpos = lea.readShort();
short ypos = lea.readShort();
short unk = lea.readShort();
short fh = lea.readShort();
byte newstate = lea.readByte();
short duration = lea.readShort();
ChairMovement cm = new ChairMovement(command, new Point(xpos, ypos), duration, newstate);
cm.setUnk(unk);
cm.setFh(fh);
res.add(cm);
break;
}*/
@@ -118,14 +118,14 @@ public abstract class AbstractMovementPacketHandler extends AbstractMaplePacketH
short ypos = lea.readShort();
short xwobble = lea.readShort();
short ywobble = lea.readShort();
short unk = lea.readShort();
short fh = lea.readShort();
short ofh = lea.readShort();
byte newstate = lea.readByte();
short duration = lea.readShort();
JumpDownMovement jdm = new JumpDownMovement(command, new Point(xpos, ypos), duration, newstate);
jdm.setUnk(unk);
jdm.setFh(fh);
jdm.setPixelsPerSecond(new Point(xwobble, ywobble));
jdm.setFH(fh);
jdm.setOriginFh(ofh);
res.add(jdm);
break;
}

25
src/net/server/channel/handlers/AutoAggroHandler.java
View File

@@ -32,32 +32,15 @@ public final class AutoAggroHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
if (c.getPlayer().isHidden()) return; // Don't auto aggro GM's in hide...
MapleCharacter player = c.getPlayer();
if (player.isHidden()) return; // Don't auto aggro GM's in hide...
MapleMap map = c.getPlayer().getMap();
MapleMap map = player.getMap();
int oid = slea.readInt();
MapleMonster monster = map.getMonsterByOid(oid);
if (monster != null) {
MapleCharacter currentController = monster.getController();
monster.lockMonster();
try {
if (currentController != null) {
if (!monster.isControllerHasAggro()) {
if (map.getCharacterById(currentController.getId()) == null) {
monster.switchController(c.getPlayer(), true);
} else {
monster.switchController(currentController, true);
}
} else if (map.getCharacterById(currentController.getId()) == null) {
monster.switchController(c.getPlayer(), true);
}
} else {
monster.switchController(c.getPlayer(), true);
}
} finally {
monster.unlockMonster();
}
monster.aggroAutoAggroUpdate(player);
}
}
}

15
src/net/server/channel/handlers/GuildOperationHandler.java
View File

@@ -47,10 +47,6 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
return true;
}
private void restancePlayer(MapleCharacter mc) {
mc.broadcastStance();
}
private class Invited {
public String name;
public int gid;
@@ -131,7 +127,8 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
c.announce(MaplePacketCreator.showGuildInfo(mc));
c.getPlayer().dropMessage(1, "You have successfully created a Guild.");
restancePlayer(mc);
mc.getGuild().broadcastNameChanged();
mc.getGuild().broadcastEmblemChanged();
break;
case 0x05:
if (mc.getGuildId() <= 0 || mc.getGuildRank() > 2) {
@@ -191,7 +188,8 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
if(allianceId > 0) Server.getInstance().getAlliance(allianceId).updateAlliancePackets(mc);
mc.saveGuildStatus(); // update database
restancePlayer(mc);
mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildNameChanged(mc.getId(), mc.getGuild().getName())); // thanks Vcoc for pointing out an issue with updating guild tooltip to players in the map
mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildMarkChanged(mc.getId(), mc.getGuild()));
break;
case 0x07:
cid = slea.readInt();
@@ -212,7 +210,7 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
mc.getMGC().setGuildId(0);
mc.getMGC().setGuildRank(5);
mc.saveGuildStatus();
restancePlayer(mc);
mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildNameChanged(mc.getId(), ""));
break;
case 0x08:
allianceId = mc.getGuild().getAllianceId();
@@ -272,7 +270,8 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
}
mc.gainMeso(-ServerConstants.CHANGE_EMBLEM_COST, true, false, true);
restancePlayer(mc);
mc.getGuild().broadcastNameChanged();
mc.getGuild().broadcastEmblemChanged();
break;
case 0x10:
if (mc.getGuildId() <= 0 || mc.getGuildRank() > 2) {

28
src/net/server/channel/handlers/MoveLifeHandler.java
View File

@@ -77,8 +77,6 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
boolean isAttack = inRangeInclusive(rawActivity, 24, 41);
boolean isSkill = inRangeInclusive(rawActivity, 42, 59);
boolean currentController = (monster.getController() == player);
MobSkill toUse = null;
int useSkillId = 0, useSkillLevel = 0;
@@ -112,10 +110,6 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
int atkStatus = monster.canUseAttack(castPos, isSkill);
if (atkStatus < 1) {
if (!currentController) {
return;
}
rawActivity = -1;
pOption = 0;
}
@@ -147,24 +141,8 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
Point startPos = new Point(start_x, start_y - 2);
List<LifeMovementFragment> res = parseMovement(slea);
boolean aggro;
monster.lockMonster();
try {
if (!currentController) {
if (monster.isAttackedBy(player)) {
monster.switchController(player, true);
} else {
return;
}
}
aggro = monster.isControllerHasAggro();
if (aggro) {
monster.setControllerKnowsAboutAggro(true);
}
} finally {
monster.unlockMonster();
}
Boolean aggro = monster.aggroMoveLifeUpdate(player);
if (aggro == null) return;
if (nextUse != null) {
c.announce(MaplePacketCreator.moveMonsterResponse(objectid, moveid, mobMp, aggro, nextSkillId, nextSkillLevel));
@@ -174,7 +152,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
if (res != null) {
if (ServerConstants.USE_DEBUG_SHOW_RCVD_MVLIFE) {
System.out.println((isSkill ? "SKILL " : (isAttack ? "ATTCK " : " ")) + "castPos: " + castPos + " rawAct: " + rawActivity + " opt: " + pOption + " skillID: " + useSkillId + " skillLV: " + useSkillLevel + " " + "allowSkill: " + nextMovementCouldBeSkill);
System.out.println((isSkill ? "SKILL " : (isAttack ? "ATTCK " : " ")) + "castPos: " + castPos + " rawAct: " + rawActivity + " opt: " + pOption + " skillID: " + useSkillId + " skillLV: " + useSkillLevel + " " + "allowSkill: " + nextMovementCouldBeSkill + " mobMp: " + mobMp);
}
map.broadcastMessage(player, MaplePacketCreator.moveMonster(objectid, nextMovementCouldBeSkill, rawActivity, useSkillId, useSkillLevel, pOption, startPos, res), monster.getPosition());

73
src/net/server/channel/handlers/PlayerInteractionHandler.java
View File

@@ -35,6 +35,7 @@ import net.AbstractMaplePacketHandler;
import server.MapleItemInformationProvider;
import server.MapleTrade;
import constants.GameConstants;
import java.sql.SQLException;
import server.maps.FieldLimit;
import server.maps.MapleHiredMerchant;
import server.maps.MapleMapObject;
@@ -61,8 +62,8 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
CHAT(6),
CHAT_THING(8),
EXIT(0xA),
OPEN(0xB),
TRADE_BIRTHDAY(0x0E),
OPEN_STORE(0xB),
OPEN_CASH(0xE),
SET_ITEMS(0xF),
SET_MESO(0x10),
CONFIRM(0x11),
@@ -74,7 +75,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
REMOVE_ITEM(0x1B),
BAN_PLAYER(0x1C),
MERCHANT_THING(0x1D),
OPEN_STORE(0x1E),
OPEN_THING(0x1E),
PUT_ITEM(0x21),
MERCHANT_BUY(0x22),
TAKE_ITEM_BACK(0x26),
@@ -136,7 +137,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
try {
byte mode = slea.readByte();
final MapleCharacter chr = c.getPlayer();
if (mode == Action.CREATE.getCode()) {
if(!chr.isAlive()) { // thanks GabrielSin for pointing this
chr.getClient().announce(MaplePacketCreator.getMiniRoomError(4));
@@ -333,14 +334,25 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
chr.closeMiniGame();
chr.closeHiredMerchant(true);
}
} else if (mode == Action.OPEN.getCode()) {
} else if (mode == Action.OPEN_STORE.getCode() || mode == Action.OPEN_CASH.getCode()) {
if (isTradeOpen(chr)) return;
if (mode == Action.OPEN_STORE.getCode()) {
slea.readByte(); //01
} else {
slea.readShort();
int birthday = slea.readInt();
if (!CashOperationHandler.checkBirthday(c, birthday)) { // birthday check here found thanks to lucasziron
c.announce(MaplePacketCreator.serverNotice(1, "Please check again the birthday date."));
return;
}
c.announce(MaplePacketCreator.hiredMerchantOwnerMaintenanceLeave());
}
MaplePlayerShop shop = chr.getPlayerShop();
MapleHiredMerchant merchant = chr.getHiredMerchant();
if (shop != null && shop.isOwner(chr)) {
slea.readByte();//01
if(ServerConstants.USE_ERASE_PERMIT_ON_OPENSHOP) {
try {
MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, shop.getItemId(), 1, true, false);
@@ -355,7 +367,6 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
chr.getMap().addMapObject(merchant);
chr.setHiredMerchant(null);
chr.getMap().broadcastMessage(MaplePacketCreator.spawnHiredMerchantBox(merchant));
slea.readByte();
}
} else if (mode == Action.READY.getCode()) {
MapleMiniGame game = chr.getMiniGame();
@@ -528,7 +539,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
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;
@@ -543,26 +554,44 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
MaplePlayerShop shop = chr.getPlayerShop();
MapleHiredMerchant merchant = chr.getHiredMerchant();
if (shop != null && shop.isOwner(chr)) {
if (shop.isOpen()) {
if (shop.isOpen() || !shop.addItem(shopItem)) { // thanks Vcoc for pointing an exploit with unlimited shop slots
c.announce(MaplePacketCreator.serverNotice(1, "You can't sell it anymore."));
return;
}
shop.addItem(shopItem);
if (ItemConstants.isRechargeable(ivItem.getItemId())) {
MapleInventoryManipulator.removeFromSlot(c, ivType, slot, ivItem.getQuantity(), true);
} else {
MapleInventoryManipulator.removeFromSlot(c, ivType, slot, (short) (bundles * perBundle), true);
}
c.announce(MaplePacketCreator.getPlayerShopItemUpdate(shop));
} else if (merchant != null && merchant.isOwner(chr)) {
if (merchant.isOpen()) {
if (ivType.equals(MapleInventoryType.CASH) && merchant.isPublished()) {
c.announce(MaplePacketCreator.serverNotice(1, "Cash items are only allowed to be sold when first opening the store."));
return;
}
if (merchant.isOpen() || !merchant.addItem(shopItem)) { // thanks Vcoc for pointing an exploit with unlimited shop slots
c.announce(MaplePacketCreator.serverNotice(1, "You can't sell it anymore."));
return;
}
merchant.addItem(shopItem);
if (ItemConstants.isRechargeable(ivItem.getItemId())) {
MapleInventoryManipulator.removeFromSlot(c, ivType, slot, ivItem.getQuantity(), true);
} else {
MapleInventoryManipulator.removeFromSlot(c, ivType, slot, (short) (bundles * perBundle), true);
}
c.announce(MaplePacketCreator.updateHiredMerchant(merchant, chr));
}
if (ItemConstants.isRechargeable(ivItem.getItemId())) {
MapleInventoryManipulator.removeFromSlot(c, ivType, slot, ivItem.getQuantity(), true);
try {
merchant.saveItems(false); // thanks Masterrulax for realizing yet another dupe with merchants/Fredrick
} catch (SQLException ex) {
ex.printStackTrace();
}
} else {
MapleInventoryManipulator.removeFromSlot(c, ivType, slot, (short) (bundles * perBundle), true);
c.announce(MaplePacketCreator.serverNotice(1, "You can't sell without owning a shop."));
}
} else if (mode == Action.REMOVE_ITEM.getCode()) {
if (isTradeOpen(chr)) return;
@@ -616,8 +645,9 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
MaplePlayerShop shop = chr.getPlayerShop();
MapleHiredMerchant merchant = chr.getHiredMerchant();
if (shop != null && shop.isVisitor(chr)) {
shop.buy(c, itemid, quantity);
shop.broadcast(MaplePacketCreator.getPlayerShopItemUpdate(shop));
if (shop.buy(c, itemid, quantity)) {
shop.broadcast(MaplePacketCreator.getPlayerShopItemUpdate(shop));
}
} else if (merchant != null && !merchant.isOwner(chr)) {
merchant.buy(c, itemid, quantity);
merchant.broadcastToVisitorsThreadsafe(MaplePacketCreator.updateHiredMerchant(merchant, chr));
@@ -661,6 +691,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
if (merchant.isOwner(chr)) {
merchant.clearMessages();
merchant.setOpen(true);
merchant.getMap().broadcastMessage(MaplePacketCreator.updateHiredMerchantBox(merchant));
}
}

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

@@ -62,7 +62,9 @@ import constants.ServerConstants;
import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import net.server.coordinator.MapleEventRecallCoordinator;
import net.server.coordinator.MapleSessionCoordinator;
import org.apache.mina.core.session.IoSession;
@@ -72,6 +74,25 @@ import tools.packets.Wedding;
public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
private static Set<Integer> attemptingLoginAccounts = new HashSet<>();
private boolean tryAcquireAccount(int accId) {
synchronized (attemptingLoginAccounts) {
if (attemptingLoginAccounts.contains(accId)) {
return false;
}
attemptingLoginAccounts.add(accId);
return true;
}
}
private void releaseAccount(int accId) {
synchronized (attemptingLoginAccounts) {
attemptingLoginAccounts.remove(accId);
}
}
@Override
public final boolean validateState(MapleClient c) {
return !c.isLoggedIn();
@@ -82,298 +103,313 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
final int cid = slea.readInt();
final Server server = Server.getInstance();
World wserv = server.getWorld(c.getWorld());
if(wserv == null) {
c.disconnect(true, false);
return;
}
Channel cserv = wserv.getChannel(c.getChannel());
if(cserv == null) {
c.setChannel(1);
cserv = wserv.getChannel(c.getChannel());
if(cserv == null) {
c.disconnect(true, false);
return;
}
}
MapleCharacter player = wserv.getPlayerStorage().getCharacterById(cid);
boolean newcomer = false;
IoSession session = c.getSession();
String remoteHwid;
if (player == null) {
if (!server.validateCharacteridInTransition((InetSocketAddress) session.getRemoteAddress(), cid)) {
c.disconnect(true, false);
return;
}
remoteHwid = MapleSessionCoordinator.getInstance().getGameSessionHwid(session);
if (remoteHwid == null) {
c.disconnect(true, false);
return;
}
if (c.tryacquireClient()) { // thanks MedicOP for assisting on concurrency protection here
try {
player = MapleCharacter.loadCharFromDB(cid, c, true);
newcomer = true;
} catch (SQLException e) {
e.printStackTrace();
}
} else {
remoteHwid = player.getClient().getHWID();
}
if (player == null) { //If you are still getting null here then please just uninstall the game >.>, we dont need you fucking with the logs
c.disconnect(true, false);
return;
}
c.setPlayer(player);
c.setAccID(player.getAccountID());
boolean allowLogin = true;
/* is this check really necessary?
if (state == MapleClient.LOGIN_SERVER_TRANSITION || state == MapleClient.LOGIN_NOTLOGGEDIN) {
List<String> charNames = c.loadCharacterNames(c.getWorld());
if(!newcomer) {
charNames.remove(player.getName());
}
for (String charName : charNames) {
if(wserv.getPlayerStorage().getCharacterByName(charName) != null) {
allowLogin = false;
break;
}
}
}
*/
c.lockClient(); // Sync this to prevent wrong login state for double channel changes
try {
int state = c.getLoginState();
if (state != MapleClient.LOGIN_SERVER_TRANSITION || !allowLogin) {
c.setPlayer(null);
c.setAccID(0);
if (state == MapleClient.LOGIN_LOGGEDIN) {
World wserv = server.getWorld(c.getWorld());
if(wserv == null) {
c.disconnect(true, false);
} else {
c.announce(MaplePacketCreator.getAfterLoginError(7));
return;
}
return;
}
c.updateLoginState(MapleClient.LOGIN_LOGGEDIN);
} finally {
c.unlockClient();
}
if (!newcomer) {
c.setCharacterSlots((byte) player.getClient().getCharacterSlots());
player.newClient(c);
}
int hwidLen = remoteHwid.length();
session.setAttribute(MapleClient.CLIENT_HWID, remoteHwid);
session.setAttribute(MapleClient.CLIENT_NIBBLEHWID, remoteHwid.substring(hwidLen - 8, hwidLen));
c.setHWID(remoteHwid);
cserv.addPlayer(player);
wserv.addPlayer(player);
player.setEnteredChannelWorld();
List<PlayerBuffValueHolder> buffs = server.getPlayerBuffStorage().getBuffsFromStorage(cid);
if (buffs != null) {
List<Pair<Long, PlayerBuffValueHolder>> timedBuffs = getLocalStartTimes(buffs);
player.silentGiveBuffs(timedBuffs);
}
Map<MapleDisease, Pair<Long, MobSkill>> diseases = server.getPlayerBuffStorage().getDiseasesFromStorage(cid);
if (diseases != null) {
player.silentApplyDiseases(diseases);
}
c.announce(MaplePacketCreator.getCharInfo(player));
if (!player.isHidden()) {
if(player.isGM() && ServerConstants.USE_AUTOHIDE_GM) {
player.toggleHide(true);
}
}
player.sendKeymap();
player.sendMacros();
// pot bindings being passed through other characters on the account detected thanks to Croosade dev team
MapleKeyBinding autohpPot = player.getKeymap().get(91);
player.announce(MaplePacketCreator.sendAutoHpPot(autohpPot != null ? autohpPot.getAction() : 0));
MapleKeyBinding autompPot = player.getKeymap().get(92);
player.announce(MaplePacketCreator.sendAutoMpPot(autompPot != null ? autompPot.getAction() : 0));
player.getMap().addPlayer(player);
player.visitMap(player.getMap());
BuddyList bl = player.getBuddylist();
int buddyIds[] = bl.getBuddyIds();
wserv.loggedOn(player.getName(), player.getId(), c.getChannel(), buddyIds);
for (CharacterIdChannelPair onlineBuddy : wserv.multiBuddyFind(player.getId(), buddyIds)) {
BuddylistEntry ble = bl.get(onlineBuddy.getCharacterId());
ble.setChannel(onlineBuddy.getChannel());
bl.put(ble);
}
c.announce(MaplePacketCreator.updateBuddylist(bl.getBuddies()));
c.announce(MaplePacketCreator.loadFamily(player));
if (player.getFamilyId() > 0) {
MapleFamily f = wserv.getFamily(player.getFamilyId());
if (f == null) {
f = new MapleFamily(player.getId());
wserv.addFamily(player.getFamilyId(), f);
}
player.setFamily(f);
c.announce(MaplePacketCreator.getFamilyInfo(f.getMember(player.getId())));
}
if (player.getGuildId() > 0) {
MapleGuild playerGuild = server.getGuild(player.getGuildId(), player.getWorld(), player);
if (playerGuild == null) {
player.deleteGuild(player.getGuildId());
player.getMGC().setGuildId(0);
player.getMGC().setGuildRank(5);
} else {
playerGuild.getMGC(player.getId()).setCharacter(player);
player.setMGC(playerGuild.getMGC(player.getId()));
server.setGuildMemberOnline(player, true, c.getChannel());
c.announce(MaplePacketCreator.showGuildInfo(player));
int allianceId = player.getGuild().getAllianceId();
if (allianceId > 0) {
MapleAlliance newAlliance = server.getAlliance(allianceId);
if (newAlliance == null) {
newAlliance = MapleAlliance.loadAlliance(allianceId);
if (newAlliance != null) {
server.addAlliance(allianceId, newAlliance);
} else {
player.getGuild().setAllianceId(0);
}
}
if (newAlliance != null) {
c.announce(MaplePacketCreator.updateAllianceInfo(newAlliance, c));
c.announce(MaplePacketCreator.allianceNotice(newAlliance.getId(), newAlliance.getNotice()));
if (newcomer) {
server.allianceMessage(allianceId, MaplePacketCreator.allianceMemberOnline(player, true), player.getId(), -1);
}
}
}
}
}
player.showNote();
if (player.getParty() != null) {
MaplePartyCharacter pchar = player.getMPC();
//Use this in case of enabling party HPbar HUD when logging in, however "you created a party" will appear on chat.
//c.announce(MaplePacketCreator.partyCreated(pchar));
pchar.setChannel(c.getChannel());
pchar.setMapId(player.getMapId());
pchar.setOnline(true);
wserv.updateParty(player.getParty().getId(), PartyOperation.LOG_ONOFF, pchar);
player.updatePartyMemberHP();
}
MapleInventory eqpInv = player.getInventory(MapleInventoryType.EQUIPPED);
eqpInv.lockInventory();
try {
for(Item it : eqpInv.list()) {
player.equippedItem((Equip) it);
}
} finally {
eqpInv.unlockInventory();
}
c.announce(MaplePacketCreator.updateBuddylist(player.getBuddylist().getBuddies()));
CharacterNameAndId pendingBuddyRequest = c.getPlayer().getBuddylist().pollPendingRequest();
if (pendingBuddyRequest != null) {
c.announce(MaplePacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName()));
}
c.announce(MaplePacketCreator.updateGender(player));
player.checkMessenger();
c.announce(MaplePacketCreator.enableReport());
player.changeSkillLevel(SkillFactory.getSkill(10000000 * player.getJobType() + 12), (byte) (player.getLinkedLevel() / 10), 20, -1);
player.checkBerserk(player.isHidden());
if (newcomer) {
for(MaplePet pet : player.getPets()) {
if(pet != null)
wserv.registerPetHunger(player, player.getPetIndex(pet));
}
player.reloadQuestExpirations();
/*
if (!c.hasVotedAlready()){
player.announce(MaplePacketCreator.earnTitleMessage("You can vote now! Vote and earn a vote point!"));
}
*/
if (player.isGM()){
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.earnTitleMessage((player.gmLevel() < 6 ? "GM " : "Admin ") + player.getName() + " has logged in"));
}
if(diseases != null) {
for(Entry<MapleDisease, Pair<Long, MobSkill>> e : diseases.entrySet()) {
final List<Pair<MapleDisease, Integer>> debuff = Collections.singletonList(new Pair<>(e.getKey(), Integer.valueOf(e.getValue().getRight().getX())));
c.announce(MaplePacketCreator.giveDebuff(debuff, e.getValue().getRight()));
Channel cserv = wserv.getChannel(c.getChannel());
if(cserv == null) {
c.setChannel(1);
cserv = wserv.getChannel(c.getChannel());
if(cserv == null) {
c.disconnect(true, false);
return;
}
}
MapleCharacter player = wserv.getPlayerStorage().getCharacterById(cid);
boolean newcomer = false;
IoSession session = c.getSession();
String remoteHwid;
if (player == null) {
if (!server.validateCharacteridInTransition((InetSocketAddress) session.getRemoteAddress(), cid)) {
c.disconnect(true, false);
return;
}
remoteHwid = MapleSessionCoordinator.getInstance().getGameSessionHwid(session);
if (remoteHwid == null) {
c.disconnect(true, false);
return;
}
try {
player = MapleCharacter.loadCharFromDB(cid, c, true);
newcomer = true;
} catch (SQLException e) {
e.printStackTrace();
}
} else {
remoteHwid = player.getClient().getHWID();
}
if (player == null) { //If you are still getting null here then please just uninstall the game >.>, we dont need you fucking with the logs
c.disconnect(true, false);
return;
}
c.setPlayer(player);
c.setAccID(player.getAccountID());
boolean allowLogin = true;
/* is this check really necessary?
if (state == MapleClient.LOGIN_SERVER_TRANSITION || state == MapleClient.LOGIN_NOTLOGGEDIN) {
List<String> charNames = c.loadCharacterNames(c.getWorld());
if(!newcomer) {
charNames.remove(player.getName());
}
for (String charName : charNames) {
if(wserv.getPlayerStorage().getCharacterByName(charName) != null) {
allowLogin = false;
break;
}
}
}
*/
int accId = c.getAccID();
if (tryAcquireAccount(accId)) { // Sync this to prevent wrong login state for double loggedin handling
try {
int state = c.getLoginState();
if (state != MapleClient.LOGIN_SERVER_TRANSITION || !allowLogin) {
c.setPlayer(null);
c.setAccID(0);
if (state == MapleClient.LOGIN_LOGGEDIN) {
c.disconnect(true, false);
} else {
c.announce(MaplePacketCreator.getAfterLoginError(7));
}
return;
}
c.updateLoginState(MapleClient.LOGIN_LOGGEDIN);
} finally {
releaseAccount(accId);
}
} else {
c.setPlayer(null);
c.setAccID(0);
c.announce(MaplePacketCreator.getAfterLoginError(10));
return;
}
player.announceDiseases();
if (!newcomer) {
c.setCharacterSlots((byte) player.getClient().getCharacterSlots());
player.newClient(c);
}
int hwidLen = remoteHwid.length();
session.setAttribute(MapleClient.CLIENT_HWID, remoteHwid);
session.setAttribute(MapleClient.CLIENT_NIBBLEHWID, remoteHwid.substring(hwidLen - 8, hwidLen));
c.setHWID(remoteHwid);
cserv.addPlayer(player);
wserv.addPlayer(player);
player.setEnteredChannelWorld();
List<PlayerBuffValueHolder> buffs = server.getPlayerBuffStorage().getBuffsFromStorage(cid);
if (buffs != null) {
List<Pair<Long, PlayerBuffValueHolder>> timedBuffs = getLocalStartTimes(buffs);
player.silentGiveBuffs(timedBuffs);
}
Map<MapleDisease, Pair<Long, MobSkill>> diseases = server.getPlayerBuffStorage().getDiseasesFromStorage(cid);
if (diseases != null) {
player.silentApplyDiseases(diseases);
}
c.announce(MaplePacketCreator.getCharInfo(player));
if (!player.isHidden()) {
if(player.isGM() && ServerConstants.USE_AUTOHIDE_GM) {
player.toggleHide(true);
}
}
player.sendKeymap();
player.sendMacros();
// pot bindings being passed through other characters on the account detected thanks to Croosade dev team
MapleKeyBinding autohpPot = player.getKeymap().get(91);
player.announce(MaplePacketCreator.sendAutoHpPot(autohpPot != null ? autohpPot.getAction() : 0));
MapleKeyBinding autompPot = player.getKeymap().get(92);
player.announce(MaplePacketCreator.sendAutoMpPot(autompPot != null ? autompPot.getAction() : 0));
player.getMap().addPlayer(player);
player.visitMap(player.getMap());
BuddyList bl = player.getBuddylist();
int buddyIds[] = bl.getBuddyIds();
wserv.loggedOn(player.getName(), player.getId(), c.getChannel(), buddyIds);
for (CharacterIdChannelPair onlineBuddy : wserv.multiBuddyFind(player.getId(), buddyIds)) {
BuddylistEntry ble = bl.get(onlineBuddy.getCharacterId());
ble.setChannel(onlineBuddy.getChannel());
bl.put(ble);
}
c.announce(MaplePacketCreator.updateBuddylist(bl.getBuddies()));
c.announce(MaplePacketCreator.loadFamily(player));
if (player.getFamilyId() > 0) {
MapleFamily f = wserv.getFamily(player.getFamilyId());
if (f == null) {
f = new MapleFamily(player.getId());
wserv.addFamily(player.getFamilyId(), f);
}
player.setFamily(f);
c.announce(MaplePacketCreator.getFamilyInfo(f.getMember(player.getId())));
}
if (player.getGuildId() > 0) {
MapleGuild playerGuild = server.getGuild(player.getGuildId(), player.getWorld(), player);
if (playerGuild == null) {
player.deleteGuild(player.getGuildId());
player.getMGC().setGuildId(0);
player.getMGC().setGuildRank(5);
} else {
playerGuild.getMGC(player.getId()).setCharacter(player);
player.setMGC(playerGuild.getMGC(player.getId()));
server.setGuildMemberOnline(player, true, c.getChannel());
c.announce(MaplePacketCreator.showGuildInfo(player));
int allianceId = player.getGuild().getAllianceId();
if (allianceId > 0) {
MapleAlliance newAlliance = server.getAlliance(allianceId);
if (newAlliance == null) {
newAlliance = MapleAlliance.loadAlliance(allianceId);
if (newAlliance != null) {
server.addAlliance(allianceId, newAlliance);
} else {
player.getGuild().setAllianceId(0);
}
}
if (newAlliance != null) {
c.announce(MaplePacketCreator.updateAllianceInfo(newAlliance, c));
c.announce(MaplePacketCreator.allianceNotice(newAlliance.getId(), newAlliance.getNotice()));
if (newcomer) {
server.allianceMessage(allianceId, MaplePacketCreator.allianceMemberOnline(player, true), player.getId(), -1);
}
}
}
}
}
player.showNote();
if (player.getParty() != null) {
MaplePartyCharacter pchar = player.getMPC();
//Use this in case of enabling party HPbar HUD when logging in, however "you created a party" will appear on chat.
//c.announce(MaplePacketCreator.partyCreated(pchar));
pchar.setChannel(c.getChannel());
pchar.setMapId(player.getMapId());
pchar.setOnline(true);
wserv.updateParty(player.getParty().getId(), PartyOperation.LOG_ONOFF, pchar);
player.updatePartyMemberHP();
}
MapleInventory eqpInv = player.getInventory(MapleInventoryType.EQUIPPED);
eqpInv.lockInventory();
try {
for(Item it : eqpInv.list()) {
player.equippedItem((Equip) it);
}
} finally {
eqpInv.unlockInventory();
}
c.announce(MaplePacketCreator.updateBuddylist(player.getBuddylist().getBuddies()));
CharacterNameAndId pendingBuddyRequest = c.getPlayer().getBuddylist().pollPendingRequest();
if (pendingBuddyRequest != null) {
c.announce(MaplePacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName()));
}
c.announce(MaplePacketCreator.updateGender(player));
player.checkMessenger();
c.announce(MaplePacketCreator.enableReport());
player.changeSkillLevel(SkillFactory.getSkill(10000000 * player.getJobType() + 12), (byte) (player.getLinkedLevel() / 10), 20, -1);
player.checkBerserk(player.isHidden());
if (newcomer) {
for(MaplePet pet : player.getPets()) {
if(pet != null)
wserv.registerPetHunger(player, player.getPetIndex(pet));
}
player.reloadQuestExpirations();
/*
if (!c.hasVotedAlready()){
player.announce(MaplePacketCreator.earnTitleMessage("You can vote now! Vote and earn a vote point!"));
}
*/
if (player.isGM()){
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.earnTitleMessage((player.gmLevel() < 6 ? "GM " : "Admin ") + player.getName() + " has logged in"));
}
if(diseases != null) {
for(Entry<MapleDisease, Pair<Long, MobSkill>> e : diseases.entrySet()) {
final List<Pair<MapleDisease, Integer>> debuff = Collections.singletonList(new Pair<>(e.getKey(), Integer.valueOf(e.getValue().getRight().getX())));
c.announce(MaplePacketCreator.giveDebuff(debuff, e.getValue().getRight()));
}
player.announceDiseases();
}
} else {
if(player.isRidingBattleship()) {
player.announceBattleshipHp();
}
}
player.buffExpireTask();
player.diseaseExpireTask();
player.skillCooldownTask();
player.expirationTask();
player.questExpirationTask();
if (GameConstants.hasSPTable(player.getJob()) && player.getJob().getId() != 2001) {
player.createDragon();
}
player.commitExcludedItems();
showDueyNotification(c, player);
if (player.getMap().getHPDec() > 0) player.resetHpDecreaseTask();
player.resetPlayerRates();
if(ServerConstants.USE_ADD_RATES_BY_LEVEL == true) player.setPlayerRates();
player.setWorldRates();
player.updateCouponRates();
player.receivePartyMemberHP();
if(player.getPartnerId() > 0) {
int partnerId = player.getPartnerId();
final MapleCharacter partner = wserv.getPlayerStorage().getCharacterById(partnerId);
if(partner != null && !partner.isAwayFromWorld()) {
player.announce(Wedding.OnNotifyWeddingPartnerTransfer(partnerId, partner.getMapId()));
partner.announce(Wedding.OnNotifyWeddingPartnerTransfer(player.getId(), player.getMapId()));
}
}
if (newcomer) {
EventInstanceManager eim = MapleEventRecallCoordinator.getInstance().recallEventInstance(cid);
if (eim != null) {
eim.registerPlayer(player);
}
}
} finally {
c.releaseClient();
}
} else {
if(player.isRidingBattleship()) {
player.announceBattleshipHp();
}
}
player.buffExpireTask();
player.diseaseExpireTask();
player.skillCooldownTask();
player.expirationTask();
player.questExpirationTask();
if (GameConstants.hasSPTable(player.getJob()) && player.getJob().getId() != 2001) {
player.createDragon();
}
player.commitExcludedItems();
showDueyNotification(c, player);
if (player.getMap().getHPDec() > 0) player.resetHpDecreaseTask();
player.resetPlayerRates();
if(ServerConstants.USE_ADD_RATES_BY_LEVEL == true) player.setPlayerRates();
player.setWorldRates();
player.updateCouponRates();
player.receivePartyMemberHP();
if(player.getPartnerId() > 0) {
int partnerId = player.getPartnerId();
final MapleCharacter partner = wserv.getPlayerStorage().getCharacterById(partnerId);
if(partner != null && !partner.isAwayFromWorld()) {
player.announce(Wedding.OnNotifyWeddingPartnerTransfer(partnerId, partner.getMapId()));
partner.announce(Wedding.OnNotifyWeddingPartnerTransfer(player.getId(), player.getMapId()));
}
}
if (newcomer) {
EventInstanceManager eim = MapleEventRecallCoordinator.getInstance().recallEventInstance(cid);
if (eim != null) {
eim.registerPlayer(player);
}
c.announce(MaplePacketCreator.getAfterLoginError(10));
}
}

24
src/net/server/channel/handlers/SpecialMoveHandler.java
View File

@@ -91,26 +91,22 @@ public final class SpecialMoveHandler extends AbstractMaplePacketHandler {
}
if (skillid == Hero.MONSTER_MAGNET || skillid == Paladin.MONSTER_MAGNET || skillid == DarkKnight.MONSTER_MAGNET) { // Monster Magnet
int num = slea.readInt();
int mobId;
byte success;
for (int i = 0; i < num; i++) {
mobId = slea.readInt();
success = slea.readByte();
chr.getMap().broadcastMessage(chr, MaplePacketCreator.showMagnet(mobId, success), false);
MapleMonster monster = chr.getMap().getMonsterByOid(mobId);
int mobOid = slea.readInt();
byte success = slea.readByte();
chr.getMap().broadcastMessage(chr, MaplePacketCreator.catchMonster(mobOid, success), false);
MapleMonster monster = chr.getMap().getMonsterByOid(mobOid);
if (monster != null) {
if (!monster.isBoss()) {
monster.lockMonster();
try {
monster.switchController(chr, monster.isControllerHasAggro());
} finally {
monster.unlockMonster();
}
monster.aggroClearDamages();
monster.aggroMonsterDamage(chr, 1);
monster.aggroSwitchController(chr, true);
}
}
}
byte direction = slea.readByte();
chr.getMap().broadcastMessage(chr, MaplePacketCreator.showBuffeffect(chr.getId(), skillid, chr.getSkillLevel(skillid), direction), false);
byte direction = slea.readByte(); // thanks MedicOP for pointing some 3rd-party related issues with Magnet
chr.getMap().broadcastMessage(chr, MaplePacketCreator.showBuffeffect(chr.getId(), skillid, chr.getSkillLevel(skillid), 1, direction), false);
c.announce(MaplePacketCreator.enableActions());
return;
} else if (skillid == Brawler.MP_RECOVERY) {// MP Recovery

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

@@ -191,7 +191,7 @@ public final class TakeDamageHandler extends AbstractMaplePacketHandler {
damage -= bouncedamage;
map.damageMonster(chr, attacker, bouncedamage);
map.broadcastMessage(chr, MaplePacketCreator.damageMonster(oid, bouncedamage), false, true);
chr.checkMonsterAggro(attacker);
attacker.aggroMonsterDamage(chr, bouncedamage);
}
if (attacker != null && damagefrom == -1 && chr.getBuffedValue(MapleBuffStat.BODY_PRESSURE) != null) {
Skill skill = SkillFactory.getSkill(Aran.BODY_PRESSURE);

371
src/net/server/coordinator/MapleMonsterAggroCoordinator.java Normal file
View File

@@ -0,0 +1,371 @@
/*
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.coordinator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import constants.ServerConstants;
import client.MapleCharacter;
import java.util.concurrent.ScheduledFuture;
import net.server.Server;
import net.server.audit.LockCollector;
import server.life.MapleMonster;
import server.maps.MapleMap;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import server.TimerManager;
import tools.Pair;
/**
*
* @author Ronan
*/
public class MapleMonsterAggroCoordinator {
private MonitoredReentrantLock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.MAP_AGGRO);
private MonitoredReentrantLock idleLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.MAP_AGGRO_IDLE, true);
private long lastStopTime = Server.getInstance().getCurrentTime();
private ScheduledFuture<?> aggroMonitor = null;
private Map<MapleMonster, Map<Integer, PlayerAggroEntry>> mobAggroEntries = new HashMap<>();
private Map<MapleMonster, List<PlayerAggroEntry>> mobSortedAggros = new HashMap<>();
private class PlayerAggroEntry {
protected int cid;
protected int averageDamage = 0;
protected int currentDamageInstances = 0;
protected long accumulatedDamage = 0;
protected int expireStreak = 0;
protected int updateStreak = 0;
protected int toNextUpdate = 0;
protected int entryRank = -1;
protected PlayerAggroEntry(int cid) {
this.cid = cid;
}
}
public void stopAggroCoordinator() {
idleLock.lock();
try {
if (aggroMonitor == null) return;
aggroMonitor.cancel(false);
aggroMonitor = null;
} finally {
idleLock.unlock();
}
lastStopTime = Server.getInstance().getCurrentTime();
}
public void startAggroCoordinator() {
idleLock.lock();
try {
if (aggroMonitor != null) return;
aggroMonitor = TimerManager.getInstance().register(new Runnable() {
@Override
public void run() {
runAggroUpdate(1);
runSortLeadingCharactersAggro();
}
}, ServerConstants.MOB_STATUS_AGGRO_INTERVAL, ServerConstants.MOB_STATUS_AGGRO_INTERVAL);
} finally {
idleLock.unlock();
}
int timeDelta = (int) Math.ceil((Server.getInstance().getCurrentTime() - lastStopTime) / ServerConstants.MOB_STATUS_AGGRO_INTERVAL);
if (timeDelta > 0) {
runAggroUpdate(timeDelta);
}
}
private static void updateEntryExpiration(PlayerAggroEntry pae) {
pae.toNextUpdate = (int) Math.ceil((120000L / ServerConstants.MOB_STATUS_AGGRO_INTERVAL) / Math.pow(2, pae.expireStreak + pae.currentDamageInstances));
}
private static void insertEntryDamage(PlayerAggroEntry pae, int damage) {
synchronized (pae) {
long totalDamage = pae.averageDamage;
totalDamage *= pae.currentDamageInstances;
totalDamage += damage;
pae.expireStreak = 0;
pae.updateStreak = 0;
updateEntryExpiration(pae);
pae.currentDamageInstances += 1;
pae.averageDamage = (int)(totalDamage / pae.currentDamageInstances);
pae.accumulatedDamage = totalDamage;
}
}
private static boolean expiredAfterUpdateEntryDamage(PlayerAggroEntry pae, int deltaTime) {
synchronized (pae) {
pae.updateStreak += 1;
pae.toNextUpdate -= deltaTime;
if (pae.toNextUpdate <= 0) { // reached dmg instance expire time
pae.expireStreak += 1;
updateEntryExpiration(pae);
pae.currentDamageInstances -= 1;
if (pae.currentDamageInstances < 1) { // expired aggro for this player
return true;
}
pae.accumulatedDamage = pae.averageDamage * pae.currentDamageInstances;
}
return false;
}
}
public void addAggroDamage(MapleMonster mob, int cid, int damage) { // assumption: should not trigger after dispose()
if (!mob.isAlive()) return;
List<PlayerAggroEntry> sortedAggro = mobSortedAggros.get(mob);
Map<Integer, PlayerAggroEntry> mobAggro = mobAggroEntries.get(mob);
if (mobAggro == null) {
if (lock.tryLock()) { // can run unreliably, as fast as possible... try lock that is!
try {
mobAggro = mobAggroEntries.get(mob);
if (mobAggro == null) {
mobAggro = new HashMap<>();
mobAggroEntries.put(mob, mobAggro);
sortedAggro = new LinkedList<>();
mobSortedAggros.put(mob, sortedAggro);
} else {
sortedAggro = mobSortedAggros.get(mob);
}
} finally {
lock.unlock();
}
} else {
return;
}
}
PlayerAggroEntry aggroEntry = mobAggro.get(cid);
if (aggroEntry == null) {
aggroEntry = new PlayerAggroEntry(cid);
synchronized (mobAggro) {
synchronized (sortedAggro) {
PlayerAggroEntry mappedEntry = mobAggro.get(cid);
if (mappedEntry == null) {
mobAggro.put(aggroEntry.cid, aggroEntry);
sortedAggro.add(aggroEntry);
} else {
aggroEntry = mappedEntry;
}
}
}
} else if (damage < 1) {
return;
}
insertEntryDamage(aggroEntry, damage);
}
private void runAggroUpdate(int deltaTime) {
List<Pair<MapleMonster, Map<Integer, PlayerAggroEntry>>> aggroMobs = new LinkedList<>();
lock.lock();
try {
for (Entry<MapleMonster, Map<Integer, PlayerAggroEntry>> e : mobAggroEntries.entrySet()) {
aggroMobs.add(new Pair<>(e.getKey(), e.getValue()));
}
} finally {
lock.unlock();
}
for (Pair<MapleMonster, Map<Integer, PlayerAggroEntry>> am : aggroMobs) {
Map<Integer, PlayerAggroEntry> mobAggro = am.getRight();
List<PlayerAggroEntry> sortedAggro = mobSortedAggros.get(am.getLeft());
if (sortedAggro != null) {
List<Integer> toRemove = new LinkedList<>();
List<Integer> toRemoveIdx = new ArrayList<>(mobAggro.size());
List<Integer> toRemoveByFetch = new LinkedList<>();
synchronized (mobAggro) {
synchronized (sortedAggro) {
for (PlayerAggroEntry pae : mobAggro.values()) {
if (expiredAfterUpdateEntryDamage(pae, deltaTime)) {
toRemove.add(pae.cid);
if (pae.entryRank > -1) toRemoveIdx.add(pae.entryRank);
else toRemoveByFetch.add(pae.cid);
}
}
if (!toRemove.isEmpty()) {
for (Integer cid : toRemove) {
mobAggro.remove(cid);
}
if (mobAggro.isEmpty()) { // all aggro on this mob expired
am.getLeft().aggroResetAggro();
}
}
if (!toRemoveIdx.isEmpty()) {
Collections.sort(toRemoveIdx, new Comparator<Integer>() { // last to first indexes
@Override
public int compare(Integer p1, Integer p2) {
return p1 < p2 ? 1 : p1.equals(p2) ? 0 : -1;
}
});
for (int idx : toRemoveIdx) {
sortedAggro.remove(idx);
}
}
if (!toRemoveByFetch.isEmpty()) {
for (Integer cid : toRemoveByFetch) {
for (int i = 0; i < sortedAggro.size(); i++) {
if (cid.equals(sortedAggro.get(i).cid)) {
sortedAggro.remove(i);
break;
}
}
}
}
}
}
}
}
}
private static void insertionSortAggroList(List<PlayerAggroEntry> paeList) {
for (int i = 1; i < paeList.size(); i++) {
PlayerAggroEntry pae = paeList.get(i);
long curAccDmg = pae.accumulatedDamage;
int j = i - 1;
while (j >= 0 && curAccDmg > paeList.get(j).accumulatedDamage) {
j -= 1;
}
j += 1;
if (j != i) {
paeList.remove(i);
paeList.add(j, pae);
}
}
int i = 0;
for (PlayerAggroEntry pae : paeList) {
pae.entryRank = i;
i += 1;
}
}
public boolean isLeadingCharacterAggro(MapleMonster mob, MapleCharacter player) {
// by assuming the quasi-sorted nature of "mobAggroList", this method
// returns whether the player given as parameter can be elected as next aggro leader
List<PlayerAggroEntry> mobAggroList = mobSortedAggros.get(mob);
if (mobAggroList != null) {
synchronized (mobAggroList) {
mobAggroList = new ArrayList<>(mobAggroList.subList(0, Math.min(mobAggroList.size(), 5)));
}
MapleMap map = mob.getMap();
for (PlayerAggroEntry pae : mobAggroList) {
MapleCharacter chr = map.getCharacterById(pae.cid);
if (chr != null) {
if (player.getId() == pae.cid) {
return true;
} else if (pae.updateStreak < ServerConstants.MOB_STATUS_AGGRO_PERSISTENCE && chr.isAlive()) { // verifies currently leading players activity
return false;
}
}
}
}
return false;
}
public void runSortLeadingCharactersAggro() {
List<List<PlayerAggroEntry>> aggroList;
lock.lock();
try {
aggroList = new ArrayList<>(mobSortedAggros.values());
} finally {
lock.unlock();
}
for (List<PlayerAggroEntry> mobAggroList : aggroList) {
synchronized (mobAggroList) {
insertionSortAggroList(mobAggroList);
}
}
}
public void removeAggroEntries(MapleMonster mob) {
lock.lock();
try {
mobAggroEntries.remove(mob);
mobSortedAggros.remove(mob);
} finally {
lock.unlock();
}
}
public void dispose() {
stopAggroCoordinator();
lock.lock();
try {
mobAggroEntries.clear();
mobSortedAggros.clear();
} finally {
lock.unlock();
}
disposeLocks();
}
private void disposeLocks() {
LockCollector.getInstance().registerDisposeAction(new Runnable() {
@Override
public void run() {
emptyLocks();
}
});
}
private void emptyLocks() {
lock = lock.dispose();
}
}

33
src/net/server/guild/MapleGuild.java
View File

@@ -39,6 +39,7 @@ import java.util.Set;
import java.util.concurrent.locks.Lock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.PlayerStorage;
import net.server.Server;
import net.server.channel.Channel;
import tools.DatabaseConnection;
@@ -109,11 +110,11 @@ public class MapleGuild {
con.close();
} catch (SQLException se) {
se.printStackTrace();
System.out.println("Unable to read guild information from sql" + se);
System.out.println("Unable to read guild information from sql: " + se);
}
}
public void buildNotifications() {
private void buildNotifications() {
if (!bDirty) {
return;
}
@@ -260,10 +261,10 @@ public class MapleGuild {
return name;
}
public java.util.Collection<MapleGuildCharacter> getMembers() {
public List<MapleGuildCharacter> getMembers() {
membersLock.lock();
try {
return java.util.Collections.unmodifiableCollection(members);
return new ArrayList<>(members);
} finally {
membersLock.unlock();
}
@@ -277,6 +278,30 @@ public class MapleGuild {
return signature;
}
public void broadcastNameChanged() {
PlayerStorage ps = Server.getInstance().getWorld(world).getPlayerStorage();
for (MapleGuildCharacter mgc : getMembers()) {
MapleCharacter chr = ps.getCharacterById(mgc.getId());
if (chr == null || !chr.isLoggedinWorld()) continue;
byte[] packet = MaplePacketCreator.guildNameChanged(chr.getId(), this.getName());
chr.getMap().broadcastMessage(chr, packet);
}
}
public void broadcastEmblemChanged() {
PlayerStorage ps = Server.getInstance().getWorld(world).getPlayerStorage();
for (MapleGuildCharacter mgc : getMembers()) {
MapleCharacter chr = ps.getCharacterById(mgc.getId());
if (chr == null || !chr.isLoggedinWorld()) continue;
byte[] packet = MaplePacketCreator.guildMarkChanged(chr.getId(), this);
chr.getMap().broadcastMessage(chr, packet);
}
}
public void broadcast(final byte[] packet) {
broadcast(packet, -1, BCOp.NONE);
}

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

@@ -612,7 +612,15 @@ public class World {
mc.saveGuildStatus();
}
if (bDifferentGuild) {
mc.broadcastStance();
if (mc.isLoggedinWorld()) {
MapleGuild guild = Server.getInstance().getGuild(guildid);
if (guild != null) {
mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildNameChanged(cid, guild.getName()));
mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildMarkChanged(cid, guild));
} else {
mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildNameChanged(cid, ""));
}
}
}
}