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 17229 additions and 16455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/MapleTrade.java
+16
View File
@@ -202,6 +202,10 @@ public class MapleTrade {
return exchangeMeso;
}
private boolean fitsMeso() {
return chr.canHoldMeso(exchangeMeso - getFee(exchangeMeso));
}
private boolean fitsInInventory() {
List<Pair<Item, MapleInventoryType>> tradeItems = new LinkedList<>();
for (Item item : exchangeItems) {
@@ -218,6 +222,18 @@ public class MapleTrade {
if (partner.isLocked()) {
local.complete1();
partner.complete1();
if (!local.fitsMeso()) {
cancelTrade(c);
c.message("There is not enough meso inventory space to complete the trade.");
partner.getChr().message("Partner does not have enough meso inventory space to complete the trade.");
return;
}
else if (!partner.fitsMeso()) {
cancelTrade(c);
c.message("Partner does not have enough meso inventory space to complete the trade.");
partner.getChr().message("There is not enough meso inventory space to complete the trade.");
return;
}
if (!local.fitsInInventory()) {
cancelTrade(c);
c.message("There is not enough inventory space to complete the trade.");
src/server/expeditions/MapleExpedition.java
+78 -36
View File
@@ -23,11 +23,17 @@
package server.expeditions;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledFuture;
import net.server.PlayerStorage;
import net.server.Server;
import server.TimerManager;
import server.life.MapleMonster;
@@ -78,18 +84,18 @@ public class MapleExpedition {
private MapleExpeditionType type;
private boolean registering;
private MapleMap startMap;
private ArrayList<String> bossLogs;
private List<String> bossLogs;
private ScheduledFuture<?> schedule;
private List<MapleCharacter> members = new ArrayList<>();
private List<Integer> banned = new ArrayList<>();
private Map<Integer, String> members = new ConcurrentHashMap<>();
private List<Integer> banned = new CopyOnWriteArrayList<>();
private long startTime;
public MapleExpedition(MapleCharacter player, MapleExpeditionType met) {
leader = player;
members.add(leader);
members.put(player.getId(), player.getName());
startMap = player.getMap();
type = met;
bossLogs = new ArrayList<String>();
bossLogs = new CopyOnWriteArrayList<>();
beginRegistration();
}
@@ -109,7 +115,7 @@ public class MapleExpedition {
@Override
public void run() {
if (registering){
leader.getClient().getChannelServer().getExpeditions().remove(exped);
startMap.getChannelServer().getExpeditions().remove(exped);
startMap.broadcastMessage(MaplePacketCreator.serverNotice(6, "[Expedition] The time limit has been reached. Expedition has been disbanded."));
dispose(false);
@@ -134,7 +140,7 @@ public class MapleExpedition {
broadcastExped(MaplePacketCreator.removeClock());
broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] The expedition has started! Good luck, brave heroes!"));
startTime = System.currentTimeMillis();
Server.getInstance().broadcastGMMessage(leader.getWorld(), MaplePacketCreator.serverNotice(6, "[Expedition] " + type.toString() + " Expedition started with leader: " + leader.getName()));
Server.getInstance().broadcastGMMessage(startMap.getWorld(), MaplePacketCreator.serverNotice(6, "[Expedition] " + type.toString() + " Expedition started with leader: " + leader.getName()));
}
public String addMember(MapleCharacter player) {
@@ -147,22 +153,21 @@ public class MapleExpedition {
if (members.size() >= type.getMaxSize()){ //Would be a miracle if anybody ever saw this
return "Sorry, this expedition is full!";
}
if (members.add(player)){
player.announce(MaplePacketCreator.getClock((int)(startTime - System.currentTimeMillis()) / 1000));
broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + player.getName() + " has joined the expedition!"));
return "You have registered for the expedition successfully!";
}
return "Sorry, something went really wrong. Report this on the forum with a screenshot!";
members.put(player.getId(), player.getName());
player.announce(MaplePacketCreator.getClock((int)(startTime - System.currentTimeMillis()) / 1000));
broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + player.getName() + " has joined the expedition!"));
return "You have registered for the expedition successfully!";
}
private void broadcastExped(byte [] data){
for (MapleCharacter member : members){
member.getClient().announce(data);
private void broadcastExped(byte[] packet){
for (MapleCharacter chr : getActiveMembers()){
chr.announce(packet);
}
}
public boolean removeMember(MapleCharacter chr) {
if(members.remove(chr)) {
if(members.remove(chr.getId()) != null) {
chr.announce(MaplePacketCreator.removeClock());
broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + chr.getName() + " has left the expedition."));
chr.dropMessage(6, "[Expedition] You have left this expedition.");
@@ -175,9 +180,42 @@ public class MapleExpedition {
public MapleExpeditionType getType() {
return type;
}
public List<MapleCharacter> getMembers() {
return members;
public List<MapleCharacter> getActiveMembers() { // thanks MedicOP for figuring out an issue with broadcasting packets to offline members
PlayerStorage ps = startMap.getWorldServer().getPlayerStorage();
List<MapleCharacter> activeMembers = new LinkedList<>();
for (Integer chrid : getMembers().keySet()){
MapleCharacter chr = ps.getCharacterById(chrid);
if (chr != null && chr.isLoggedinWorld()) {
activeMembers.add(chr);
}
}
return activeMembers;
}
public Map<Integer, String> getMembers() {
return new HashMap<>(members);
}
public List<Entry<Integer, String>> getMemberList() {
List<Entry<Integer, String>> memberList = new LinkedList<>();
Entry<Integer, String> leaderEntry = null;
for (Entry<Integer, String> e : getMembers().entrySet()) {
if (!isLeader(e.getKey())) {
memberList.add(e);
} else {
leaderEntry = e;
}
}
if (leaderEntry != null) {
memberList.add(0, leaderEntry);
}
return memberList;
}
public MapleCharacter getLeader(){
@@ -189,16 +227,15 @@ public class MapleExpedition {
}
public boolean contains(MapleCharacter player) {
for (MapleCharacter member : members){
if (member.getId() == player.getId()){
return true;
}
}
return false;
return members.containsKey(player.getId());
}
public boolean isLeader(MapleCharacter player) {
return leader.equals(player);
return isLeader(player.getId());
}
public boolean isLeader(int playerid) {
return leader.getId() == playerid;
}
public boolean isRegistering(){
@@ -209,15 +246,20 @@ public class MapleExpedition {
return !registering;
}
public void ban(MapleCharacter player) {
if (!banned.contains(player.getId())) {
banned.add(player.getId());
members.remove(player);
public void ban(Entry<Integer, String> chr) {
int cid = chr.getKey();
if (!banned.contains(cid)) {
banned.add(cid);
members.remove(cid);
broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + player.getName() + " has been banned from the expedition."));
broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + chr.getValue() + " has been banned from the expedition."));
player.announce(MaplePacketCreator.removeClock());
player.dropMessage(6, "[Expedition] You have been banned from this expedition.");
MapleCharacter player = startMap.getWorldServer().getPlayerStorage().getCharacterById(cid);
if (player != null && player.isLoggedinWorld()) {
player.announce(MaplePacketCreator.removeClock());
player.dropMessage(6, "[Expedition] You have been banned from this expedition.");
}
}
}
@@ -225,7 +267,7 @@ public class MapleExpedition {
return startTime;
}
public ArrayList<String> getBossLogs(){
public List<String> getBossLogs(){
return bossLogs;
}
src/server/life/MapleMonster.java
+262 -136
View File
@@ -55,7 +55,6 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import net.server.audit.locks.MonitoredReentrantLock;
import net.server.Server;
import net.server.channel.Channel;
import net.server.world.World;
import net.server.world.MapleParty;
@@ -72,6 +71,7 @@ import tools.Randomizer;
import net.server.audit.LockCollector;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.coordinator.MapleMonsterAggroCoordinator;
public class MapleMonster extends AbstractLoadedMapleLife {
private ChangeableStats ostats = null; //unused, v83 WZs offers no support for changeable stats.
@@ -100,6 +100,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
private MonitoredReentrantLock monsterLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.MOB, true);
private MonitoredReentrantLock statiLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.MOB_STATI);
private MonitoredReentrantLock animationLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.MOB_ANI);
private MonitoredReentrantLock aggroUpdateLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.MOB_AGGRO);
public MapleMonster(int id, MapleMonsterStats stats) {
super(id);
@@ -578,31 +579,10 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
}
private Pair<MapleCharacter, Boolean> removeController() {
this.lockMonster();
try {
MapleCharacter chrController = getController();
boolean hadAggro = isControllerHasAggro();
if (chrController != null) { // this can/should only happen when a hidden gm attacks the monster
chrController.announce(MaplePacketCreator.stopControllingMonster(this.getObjectId()));
chrController.stopControllingMonster(this);
}
setController(null);
setControllerHasAggro(false);
setControllerKnowsAboutAggro(false);
return new Pair<>(chrController, hadAggro);
} finally {
this.unlockMonster();
}
}
public MapleCharacter killBy(final MapleCharacter killer) {
distributeExperience(killer != null ? killer.getId() : 0);
final Pair<MapleCharacter, Boolean> lastController = removeController();
final Pair<MapleCharacter, Boolean> lastController = aggroRemoveController();
final List<Integer> toSpawn = this.getRevives();
if (toSpawn != null) {
final MapleMap reviveMap = map;
@@ -675,7 +655,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
reviveMap.killMonster(reviveMap.getMonsterById(i), killer, true);
}
} else if (controller != null) {
mob.switchController(controller, aggro);
mob.aggroSwitchController(controller, aggro);
}
if(eim != null) {
@@ -725,10 +705,12 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
private synchronized void processMonsterKilled(boolean hasKiller) {
if(!hasKiller) {
if(!hasKiller) { // players won't gain EXP from a mob that has no killer, but a quest count they should
dispatchUpdateQuestMobCount();
}
this.aggroClearDamages();
MonsterListener[] listenersList;
statiLock.lock();
try {
@@ -794,46 +776,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
public boolean isAlive() {
return this.hp.get() > 0;
}
public MapleCharacter getController() {
monsterLock.lock();
try {
return controller.get();
} finally {
monsterLock.unlock();
}
}
public void setController(MapleCharacter controller) {
monsterLock.lock();
try {
this.controller = new WeakReference<>(controller);
} finally {
monsterLock.unlock();
}
}
public void switchController(MapleCharacter newController, boolean immediateAggro) {
this.lockMonster();
try {
MapleCharacter controllers = getController();
if (controllers == newController) {
return;
}
removeController();
newController.controlMonster(this, immediateAggro);
setController(newController);
if (immediateAggro) {
setControllerHasAggro(true);
}
setControllerKnowsAboutAggro(false);
} finally {
this.unlockMonster();
}
}
public void addListener(MonsterListener listener) {
statiLock.lock();
try {
@@ -843,46 +786,28 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
}
public boolean isControllerHasAggro() {
monsterLock.lock();
try {
return fake ? false : controllerHasAggro;
} finally {
monsterLock.unlock();
}
public MapleCharacter getController() {
return controller.get();
}
public void setControllerHasAggro(boolean controllerHasAggro) {
monsterLock.lock();
try {
if (fake) {
return;
}
this.controllerHasAggro = controllerHasAggro;
} finally {
monsterLock.unlock();
}
private void setController(MapleCharacter controller) {
this.controller = new WeakReference<>(controller);
}
public boolean isControllerHasAggro() {
return fake ? false : controllerHasAggro;
}
private void setControllerHasAggro(boolean controllerHasAggro) {
if (!fake) this.controllerHasAggro = controllerHasAggro;
}
public boolean isControllerKnowsAboutAggro() {
monsterLock.lock();
try {
return fake ? false : controllerKnowsAboutAggro;
} finally {
monsterLock.unlock();
}
return fake ? false : controllerKnowsAboutAggro;
}
public void setControllerKnowsAboutAggro(boolean controllerKnowsAboutAggro) {
monsterLock.lock();
try {
if (fake) {
return;
}
this.controllerKnowsAboutAggro = controllerKnowsAboutAggro;
} finally {
monsterLock.unlock();
}
private void setControllerKnowsAboutAggro(boolean controllerKnowsAboutAggro) {
if (!fake) this.controllerKnowsAboutAggro = controllerKnowsAboutAggro;
}
public byte[] makeBossHPBarPacket() {
@@ -956,15 +881,29 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
}
private MapleCharacter getActiveController() {
MapleCharacter chr = getController();
if (chr != null && chr.isLoggedinWorld() && chr.getMap() == this.getMap()) {
return chr;
} else {
return null;
}
}
private void broadcastMonsterStatusMessage(byte[] packet) {
map.broadcastMessage(packet, getPosition());
MapleCharacter chrController = getActiveController();
if (chrController != null && !chrController.isMapObjectVisible(MapleMonster.this)) {
chrController.announce(packet);
}
}
private int broadcastStatusEffect(final MonsterStatusEffect status) {
int animationTime = status.getSkill().getAnimationTime();
byte[] packet = MaplePacketCreator.applyMonsterStatus(getObjectId(), status, null);
map.broadcastMessage(packet, getPosition());
MapleCharacter chrController = getController();
if (chrController != null && !chrController.isMapObjectVisible(this)) {
chrController.getClient().announce(packet);
}
broadcastMonsterStatusMessage(packet);
return animationTime;
}
@@ -1041,12 +980,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
public void run() {
if (isAlive()) {
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), status.getStati());
map.broadcastMessage(packet, getPosition());
MapleCharacter controller = getController();
if (controller != null && !controller.isMapObjectVisible(MapleMonster.this)) {
controller.getClient().announce(packet);
}
broadcastMonsterStatusMessage(packet);
}
statiLock.lock();
@@ -1148,12 +1082,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
public void run() {
if (isAlive()) {
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), stats);
map.broadcastMessage(packet, getPosition());
MapleCharacter controller = getController();
if (controller != null && !controller.isMapObjectVisible(MapleMonster.this)) {
controller.getClient().announce(packet);
}
broadcastMonsterStatusMessage(packet);
statiLock.lock();
try {
@@ -1168,7 +1097,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
};
final MonsterStatusEffect effect = new MonsterStatusEffect(stats, null, skill, true);
byte[] packet = MaplePacketCreator.applyMonsterStatus(getObjectId(), effect, reflection);
map.broadcastMessage(packet, getPosition());
broadcastMonsterStatusMessage(packet);
statiLock.lock();
try {
@@ -1180,11 +1109,6 @@ public class MapleMonster extends AbstractLoadedMapleLife {
statiLock.unlock();
}
MapleCharacter controller = getController();
if (controller != null && !controller.isMapObjectVisible(this)) {
controller.getClient().announce(packet);
}
map.getChannelServer().registerMobStatus(map.getId(), effect, cancelTask, duration);
}
@@ -1193,30 +1117,28 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
public void resetMobPosition(Point newPoint) {
removeController();
aggroRemoveController();
setPosition(newPoint);
map.broadcastMessage(MaplePacketCreator.moveMonster(this.getObjectId(), false, -1, 0, 0, 0, this.getPosition(), this.getIdleMovement()));
map.moveMonster(this, this.getPosition());
map.updateMonsterController(this);
aggroUpdateController();
}
private void debuffMobStat(MonsterStatus stat) {
MonsterStatusEffect oldEffect;
statiLock.lock();
try {
if (isBuffed(stat)) {
final MonsterStatusEffect oldEffect = stati.get(stat);
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), oldEffect.getStati());
map.broadcastMessage(packet, getPosition());
MapleCharacter chrController = getController();
if (chrController != null && !chrController.isMapObjectVisible(MapleMonster.this)) {
chrController.getClient().announce(packet);
}
stati.remove(stat);
}
oldEffect = stati.remove(stat);
} finally {
statiLock.unlock();
}
if (oldEffect != null) {
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), oldEffect.getStati());
broadcastMonsterStatusMessage(packet);
}
}
public void debuffMob(int skillid) {
@@ -1280,7 +1202,11 @@ public class MapleMonster extends AbstractLoadedMapleLife {
public MapleMap getMap() {
return map;
}
public MapleMonsterAggroCoordinator getMapAggroCoordinator() {
return map.getAggroCoordinator();
}
public List<Pair<Integer, Integer>> getSkills() {
return stats.getSkills();
}
@@ -1679,6 +1605,206 @@ public class MapleMonster extends AbstractLoadedMapleLife {
changeLevelByDifficulty(difficulty, pqMob);
}
private MapleCharacter getNextControllerCandidate() {
int mincontrolled = Integer.MAX_VALUE;
MapleCharacter newController = null;
int mincontrolleddead = Integer.MAX_VALUE;
MapleCharacter newControllerDead = null;
for (MapleCharacter chr : getMap().getAllPlayers()) {
if (!chr.isHidden()) {
int ctrlMonsSize = chr.getNumControlledMonsters();
if (chr.isAlive()) {
if (ctrlMonsSize < mincontrolled) {
mincontrolled = ctrlMonsSize;
newController = chr;
}
} else {
if (ctrlMonsSize < mincontrolleddead) {
mincontrolleddead = ctrlMonsSize;
newControllerDead = chr;
}
}
}
}
return newController != null ? newController : newControllerDead;
}
/**
* Removes controllability status from the current controller of this mob.
*
*/
private Pair<MapleCharacter, Boolean> aggroRemoveController() {
MapleCharacter chrController;
boolean hadAggro;
aggroUpdateLock.lock();
try {
chrController = getActiveController();
hadAggro = isControllerHasAggro();
this.setController(null);
this.setControllerHasAggro(false);
this.setControllerKnowsAboutAggro(false);
} finally {
aggroUpdateLock.unlock();
}
if (chrController != null) { // this can/should only happen when a hidden gm attacks the monster
chrController.announce(MaplePacketCreator.stopControllingMonster(this.getObjectId()));
chrController.stopControllingMonster(this);
}
return new Pair<>(chrController, hadAggro);
}
/**
* Pass over the mob controllability and updates aggro status on the new
* player controller.
*
*/
public void aggroSwitchController(MapleCharacter newController, boolean immediateAggro) {
if (aggroUpdateLock.tryLock()) {
try {
MapleCharacter prevController = getController();
if (prevController == newController) {
return;
}
aggroRemoveController();
if (!(newController != null && newController.isLoggedinWorld() && newController.getMap() == this.getMap())) {
return;
}
this.setController(newController);
this.setControllerHasAggro(immediateAggro);
this.setControllerKnowsAboutAggro(false);
} finally {
aggroUpdateLock.unlock();
}
newController.announce(MaplePacketCreator.controlMonster(this, false, immediateAggro));
newController.controlMonster(this);
}
}
/**
* Automagically finds a new controller for the given monster from the chars
* on the map it is from...
*
*/
public void aggroUpdateController() {
MapleCharacter chrController = this.getActiveController();
if (chrController != null && chrController.isAlive()) {
return;
}
MapleCharacter newController = getNextControllerCandidate();
if (newController == null) { // was a new controller found? (if not no one is on the map)
return;
}
this.aggroSwitchController(newController, false);
}
/**
* Ensures controllability removal of the current player controller, and
* fetches for any player on the map to start controlling in place.
*
*/
public void aggroRedirectController() {
this.aggroRemoveController(); // don't care if new controller not found, at least remove current controller
this.aggroUpdateController();
}
/**
* Returns the current aggro status on the specified player, or null if the
* specified player is currently not this mob's controller.
*
*/
public Boolean aggroMoveLifeUpdate(MapleCharacter player) {
MapleCharacter chrController = getController();
if (chrController != null && player.getId() == chrController.getId()) {
boolean aggro = this.isControllerHasAggro();
if (aggro) {
this.setControllerKnowsAboutAggro(true);
}
return aggro;
} else {
return null;
}
}
/**
* Refreshes auto aggro for the player passed as parameter, does nothing if
* there is already an active controller for this mob.
*
*/
public void aggroAutoAggroUpdate(MapleCharacter player) {
MapleCharacter chrController = this.getActiveController();
if (chrController == null) {
this.aggroSwitchController(player, true);
} else if (chrController.getId() == player.getId()) {
this.setControllerHasAggro(true);
}
}
/**
* Applied damage input for this mob, enough damage taken implies
* an aggro target update for the attacker shortly.
*
*/
public void aggroMonsterDamage(MapleCharacter attacker, int damage) {
MapleMonsterAggroCoordinator mmac = this.getMapAggroCoordinator();
mmac.addAggroDamage(this, attacker.getId(), damage);
MapleCharacter chrController = this.getController(); // aggro based on DPS rather than first-come-first-served, now live after suggestions thanks to MedicOP, Thora, Vcoc
if (chrController != attacker) {
if (this.getMapAggroCoordinator().isLeadingCharacterAggro(this, attacker)) {
this.aggroSwitchController(attacker, true);
}
/*
For some reason, some mobs loses aggro on controllers if other players also attacks them.
Maybe it was intended by Nexon to interchange controllers at every attack...
else if (chrController != null) {
chrController.announce(MaplePacketCreator.stopControllingMonster(this.getObjectId()));
chrController.announce(MaplePacketCreator.controlMonster(this, false, true));
}
*/
} else {
this.setControllerHasAggro(true);
}
}
/**
* Clears all applied damage input for this mob, doesn't refresh target aggro.
*
*/
public void aggroClearDamages() {
this.getMapAggroCoordinator().removeAggroEntries(this);
}
/**
* Clears this mob aggro on the current controller.
*
*/
public void aggroResetAggro() {
aggroUpdateLock.lock();
try {
this.setControllerHasAggro(false);
this.setControllerKnowsAboutAggro(false);
} finally {
aggroUpdateLock.unlock();
}
}
public final void disposeLocks() {
LockCollector.getInstance().registerDisposeAction(new Runnable() {
@Override
src/server/life/MapleMonsterInformationProvider.java
+21 -6
View File
@@ -52,8 +52,9 @@ public class MapleMonsterInformationProvider {
return instance;
}
private final Map<Integer, List<MonsterDropEntry>> drops = new HashMap<>();
private final Map<Integer, List<MonsterDropEntry>> drops = new HashMap<>();
private final List<MonsterGlobalDropEntry> globaldrops = new ArrayList<>();
private final Map<Integer, List<MonsterGlobalDropEntry>> continentdrops = new HashMap<>();
private final Map<Integer, List<Integer>> dropsChancePool = new HashMap<>(); // thanks to ronan
private final Set<Integer> hasNoMultiEquipDrops = new HashSet<>();
@@ -70,9 +71,24 @@ public class MapleMonsterInformationProvider {
protected MapleMonsterInformationProvider() {
retrieveGlobal();
}
public final List<MonsterGlobalDropEntry> getGlobalDrop() {
return globaldrops;
public final List<MonsterGlobalDropEntry> getRelevantGlobalDrops(int mapid) {
int continentid = mapid / 100000000;
List<MonsterGlobalDropEntry> contiItems = continentdrops.get(continentid);
if (contiItems == null) { // continent separated global drops found thanks to marcuswoon
contiItems = new ArrayList<>();
for (MonsterGlobalDropEntry e : globaldrops) {
if (e.continentid < 0 || e.continentid == continentid) {
contiItems.add(e);
}
}
continentdrops.put(continentid, contiItems);
}
return contiItems;
}
private void retrieveGlobal() {
@@ -90,8 +106,7 @@ public class MapleMonsterInformationProvider {
new MonsterGlobalDropEntry(
rs.getInt("itemid"),
rs.getInt("chance"),
rs.getInt("continent"),
rs.getByte("dropType"),
rs.getByte("continent"),
rs.getInt("minimum_quantity"),
rs.getInt("maximum_quantity"),
rs.getShort("questid")));
src/server/life/MonsterGlobalDropEntry.java
+3 -4
View File
@@ -25,15 +25,14 @@ package server.life;
* @author LightPepsi
*/
public class MonsterGlobalDropEntry {
public MonsterGlobalDropEntry(int itemId, int chance, int continent, byte dropType, int Minimum, int Maximum, short questid) {
public MonsterGlobalDropEntry(int itemId, int chance, int continent, int Minimum, int Maximum, short questid) {
this.itemId = itemId;
this.chance = chance;
this.dropType = dropType;
this.questid = questid;
this.continentid = continent;
this.Minimum = Minimum;
this.Maximum = Maximum;
}
public byte dropType;
public int itemId, chance, Minimum, Maximum;
public int itemId, chance, Minimum, Maximum, continentid;
public short questid;
}
src/server/maps/MapleHiredMerchant.java
+18 -11
View File
@@ -64,6 +64,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
private List<Pair<String, Byte>> messages = new LinkedList<>();
private List<SoldItem> sold = new LinkedList<>();
private AtomicBoolean open = new AtomicBoolean();
private boolean published = false;
private MapleMap map;
private Lock visitorLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.VISITOR_MERCH, true);
@@ -100,10 +101,14 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
visitorLock.lock();
try {
byte count = 0;
for (MapleCharacter visitor : visitors) {
if (visitor != null) {
count++;
if (this.isOpen()) {
for (MapleCharacter visitor : visitors) {
if (visitor != null) {
count++;
}
}
} else {
count = (byte) (visitors.length + 1);
}
return new byte[]{count, (byte) (visitors.length + 1)};
@@ -471,15 +476,12 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
return false;
}
public void addItem(MaplePlayerShopItem item) {
public boolean addItem(MaplePlayerShopItem item) {
synchronized (items) {
if (items.size() >= 16) return false;
items.add(item);
}
try {
this.saveItems(false);
} catch (SQLException ex) {
ex.printStackTrace();
return true;
}
}
@@ -521,13 +523,18 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
public void setDescription(String description) {
this.description = description;
}
public boolean isPublished() {
return published;
}
public boolean isOpen() {
return open.get();
}
public void setOpen(boolean set) {
open.getAndSet(set);
published = true;
}
public int getItemId() {
src/server/maps/MapleMap.java
+28 -106
View File
@@ -62,6 +62,7 @@ import net.server.audit.locks.MonitoredReentrantReadWriteLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import java.lang.ref.WeakReference;
import net.server.Server;
import net.server.coordinator.MapleMonsterAggroCoordinator;
import net.server.channel.Channel;
import net.server.world.World;
import scripting.map.MapScriptManager;
@@ -140,6 +141,7 @@ public class MapleMap {
private int fieldType;
private int fieldLimit = 0;
private int mobCapacity = -1;
private MapleMonsterAggroCoordinator aggroMonitor = null; // aggroMonitor activity in sync with itemMonitor
private ScheduledFuture<?> mapMonitor = null;
private ScheduledFuture<?> itemMonitor = null;
private ScheduledFuture<?> expireItemsTask = null;
@@ -185,6 +187,8 @@ public class MapleMap {
final ReentrantReadWriteLock objectLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.MAP_OBJS, true);
objectRLock = objectLock.readLock();
objectWLock = objectLock.writeLock();
aggroMonitor = new MapleMonsterAggroCoordinator();
}
public void setEventInstance(EventInstanceManager eim) {
@@ -709,7 +713,7 @@ public class MapleMap {
if(useBaseRate) chRate = 1;
final MapleMonsterInformationProvider mi = MapleMonsterInformationProvider.getInstance();
final List<MonsterGlobalDropEntry> globalEntry = mi.getGlobalDrop();
final List<MonsterGlobalDropEntry> globalEntry = mi.getRelevantGlobalDrops(this.getId());
final List<MonsterDropEntry> dropEntry = new ArrayList<>();
final List<MonsterDropEntry> visibleQuestEntry = new ArrayList<>();
@@ -777,6 +781,7 @@ public class MapleMap {
if(itemMonitorTimeout == 0) {
if(itemMonitor != null) {
stopItemMonitor();
aggroMonitor.stopAggroCoordinator();
}
return;
@@ -1144,12 +1149,10 @@ public class MapleMap {
}
public List<MapleCharacter> getAllPlayers() {
List<MapleCharacter> character = new LinkedList<>();
List<MapleCharacter> character;
chrRLock.lock();
try {
for (MapleCharacter a : characters) {
character.add(a);
}
character = new ArrayList<>(characters);
} finally {
chrRLock.unlock();
}
@@ -1316,7 +1319,7 @@ public class MapleMap {
if (mons != null) {
if (mons.getId() == 8800000) {
makeMonsterReal(mons);
updateMonsterController(mons);
mons.aggroUpdateController();
break;
}
}
@@ -1552,88 +1555,6 @@ public class MapleMap {
}
}
private MapleCharacter getNextControllerCandidate() {
int mincontrolled = Integer.MAX_VALUE;
MapleCharacter newController = null;
int mincontrolleddead = Integer.MAX_VALUE;
MapleCharacter newControllerDead = null;
chrRLock.lock();
try {
for (MapleCharacter chr : characters) {
if (!chr.isHidden()) {
int ctrlMonsSize = chr.getControlledMonsters().size();
if (chr.isAlive()) {
if (ctrlMonsSize < mincontrolled) {
mincontrolled = ctrlMonsSize;
newController = chr;
}
} else {
if (ctrlMonsSize < mincontrolleddead) {
mincontrolleddead = ctrlMonsSize;
newControllerDead = chr;
}
}
}
}
} finally {
chrRLock.unlock();
}
return newController != null ? newController : newControllerDead;
}
/**
* Automagically finds a new controller for the given monster from the chars
* on the map...
*
* @param monster
*/
public void updateMonsterController(MapleMonster monster) {
monster.lockMonster();
try {
if (!monster.isAlive()) {
return;
}
MapleCharacter newController;
MapleCharacter chrController = monster.getController();
if (chrController != null) {
if (chrController.getMap() != this) {
chrController.stopControllingMonster(monster);
newController = getNextControllerCandidate();
} else {
if (chrController.isAlive()) {
return;
}
newController = getNextControllerCandidate();
if (newController == null || !newController.isAlive()) {
return;
}
chrController.stopControllingMonster(monster);
}
} else {
newController = getNextControllerCandidate();
}
if (newController != null) { // was a new controller found? (if not no one is on the map)
if (monster.isFirstAttack()) {
newController.controlMonster(monster, true);
monster.setControllerHasAggro(true);
monster.setControllerKnowsAboutAggro(true);
} else {
newController.controlMonster(monster, false);
}
}
} finally {
monster.unlockMonster();
}
}
private Map<Integer, MapleMapObject> getCopyMapObjects() {
objectRLock.lock();
try {
@@ -1862,7 +1783,7 @@ public class MapleMap {
}
});
updateMonsterController(monster);
monster.aggroUpdateController();
if (monster.hasBossHPBar()) {
broadcastBossHpMessage(monster, monster.hashCode(), monster.makeBossHPBarPacket(), monster.getPosition());
@@ -1948,7 +1869,7 @@ public class MapleMap {
}
}, null);
updateMonsterController(monster);
monster.aggroUpdateController();
if (monster.hasBossHPBar()) {
broadcastBossHpMessage(monster, monster.hashCode(), monster.makeBossHPBarPacket(), monster.getPosition());
@@ -1993,7 +1914,8 @@ public class MapleMap {
c.announce(MaplePacketCreator.spawnMonster(monster, true, effect));
}
});
updateMonsterController(monster);
monster.aggroUpdateController();
if (monster.hasBossHPBar()) {
broadcastBossHpMessage(monster, monster.hashCode(), monster.makeBossHPBarPacket(), monster.getPosition());
@@ -2019,7 +1941,8 @@ public class MapleMap {
public void makeMonsterReal(final MapleMonster monster) {
monster.setFake(false);
broadcastMessage(MaplePacketCreator.makeMonsterReal(monster));
updateMonsterController(monster);
monster.aggroUpdateController();
}
public void spawnReactor(final MapleReactor reactor) {
@@ -2403,7 +2326,10 @@ public class MapleMap {
chr.setMapId(mapid);
if (chrSize == 1) {
if(!hasItemMonitor()) startItemMonitor();
if(!hasItemMonitor()) {
startItemMonitor();
aggroMonitor.startAggroCoordinator();
}
if (onFirstUserEnter.length() != 0 && !chr.hasEntered(onFirstUserEnter, mapid) && MapScriptManager.getInstance().scriptExists(onFirstUserEnter, true)) {
chr.enteredScript(onFirstUserEnter, mapid);
@@ -2688,19 +2614,8 @@ public class MapleMap {
broadcastGMMessage(MaplePacketCreator.removePlayerFromMap(chr.getId()));
}
for (MapleMonster monster : chr.getControlledMonsters()) {
monster.lockMonster();
try {
monster.setController(null);
monster.setControllerHasAggro(false);
monster.setControllerKnowsAboutAggro(false);
updateMonsterController(monster);
} finally {
monster.unlockMonster();
}
}
chr.leaveMap();
for (MapleSummon summon : new ArrayList<>(chr.getSummonsValues())) {
if (summon.isStationary()) {
chr.cancelEffectFromBuffStat(MapleBuffStat.PUPPET);
@@ -2926,7 +2841,7 @@ public class MapleMap {
if (isNonRangedType(o.getType())) {
o.sendSpawnData(mapleClient);
} else if (o.getType() == MapleMapObjectType.MONSTER) {
updateMonsterController((MapleMonster) o);
((MapleMonster) o).aggroUpdateController();
} else if (o.getType() == MapleMapObjectType.SUMMON) {
MapleSummon summon = (MapleSummon) o;
if (summon.getOwner() == chr) {
@@ -3038,6 +2953,10 @@ public class MapleMap {
mapArea.setBounds(vrLeft, vrTop, vrRight - vrLeft, vrBottom - vrTop);
}
public MapleMonsterAggroCoordinator getAggroCoordinator() {
return aggroMonitor;
}
/**
* it's threadsafe, gtfo :D
*
@@ -4091,6 +4010,9 @@ public class MapleMap {
chrWLock.lock();
try {
aggroMonitor.dispose();
aggroMonitor = null;
if(itemMonitor != null) {
itemMonitor.cancel(false);
itemMonitor = null;
src/server/maps/MaplePlayerShop.java
+30 -9
View File
@@ -103,11 +103,15 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
visitorLock.lock();
try {
byte count = 0;
for (MapleCharacter visitor : visitors) {
if (visitor != null) {
count++;
//if (this.isOpen()) {
for (MapleCharacter visitor : visitors) {
if (visitor != null) {
count++;
}
}
}
//} else { shouldn't happen since there isn't a "closed" state for player shops.
// count = (byte) (visitors.length + 1);
//}
return new byte[]{count, (byte) visitors.length};
} finally {
@@ -198,9 +202,12 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
}
}
public void addItem(MaplePlayerShopItem item) {
public boolean addItem(MaplePlayerShopItem item) {
synchronized (items) {
if (items.size() >= 16) return false;
items.add(item);
return true;
}
}
@@ -241,7 +248,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
* @param item
* @param quantity
*/
public void buy(MapleClient c, int item, short quantity) {
public boolean buy(MapleClient c, int item, short quantity) {
synchronized (items) {
if (isVisitor(c.getPlayer())) {
MaplePlayerShopItem pItem = items.get(item);
@@ -250,10 +257,10 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
newItem.setQuantity((short) ((pItem.getItem().getQuantity() * quantity)));
if (quantity < 1 || !pItem.isExist() || pItem.getBundles() < quantity) {
c.announce(MaplePacketCreator.enableActions());
return;
return false;
} else if (newItem.getInventoryType().equals(MapleInventoryType.EQUIP) && newItem.getQuantity() > 1) {
c.announce(MaplePacketCreator.enableActions());
return;
return false;
}
MapleKarmaManipulator.toggleKarmaFlagToUntradeable(newItem);
@@ -264,6 +271,12 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
if (c.getPlayer().getMeso() >= price) {
if (canBuy(c, newItem)) {
if (!owner.canHoldMeso(price)) {
owner.dropMessage(1, "Transaction failed since the shop owner can't hold any more mesos.");
c.announce(MaplePacketCreator.enableActions());
return false;
}
c.getPlayer().gainMeso(-price, false);
owner.gainMeso(price, true);
@@ -286,13 +299,21 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
}
} else {
c.getPlayer().dropMessage(1, "Your inventory is full. Please clean a slot before buying this item.");
c.announce(MaplePacketCreator.enableActions());
return false;
}
} else {
c.getPlayer().dropMessage(1, "You don't have enough mesos to purchase this item.");
c.announce(MaplePacketCreator.enableActions());
return false;
}
return true;
} finally {
visitorLock.unlock();
}
} else {
return false;
}
}
}
@@ -418,9 +439,9 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
}
public void closeShop() {
owner.getMap().broadcastMessage(MaplePacketCreator.removePlayerShopBox(this));
clearChatLog();
removeVisitors();
owner.getMap().broadcastMessage(MaplePacketCreator.removePlayerShopBox(this));
}
public void sendShop(MapleClient c) {
src/server/movement/AbsoluteLifeMovement.java
+6 -6
View File
@@ -26,7 +26,7 @@ import tools.data.output.LittleEndianWriter;
public class AbsoluteLifeMovement extends AbstractLifeMovement {
private Point pixelsPerSecond;
private int unk;
private int fh;
public AbsoluteLifeMovement(int type, Point position, int duration, int newstate) {
super(type, position, duration, newstate);
@@ -40,12 +40,12 @@ public class AbsoluteLifeMovement extends AbstractLifeMovement {
this.pixelsPerSecond = wobble;
}
public int getUnk() {
return unk;
public int getFh() { // unk -> fh, thanks Spoon for pointing this out
return fh;
}
public void setUnk(int unk) {
this.unk = unk;
public void setFh(int fh) {
this.fh = fh;
}
@Override
@@ -55,7 +55,7 @@ public class AbsoluteLifeMovement extends AbstractLifeMovement {
lew.writeShort(getPosition().y);
lew.writeShort(pixelsPerSecond.x);
lew.writeShort(pixelsPerSecond.y);
lew.writeShort(unk);
lew.writeShort(fh);
lew.write(getNewstate());
lew.writeShort(getDuration());
}
src/server/movement/ChairMovement.java
+6 -6
View File
@@ -25,18 +25,18 @@ import java.awt.Point;
import tools.data.output.LittleEndianWriter;
public class ChairMovement extends AbstractLifeMovement {
private int unk;
private int fh;
public ChairMovement(int type, Point position, int duration, int newstate) {
super(type, position, duration, newstate);
}
public int getUnk() {
return unk;
public int getFh() {
return fh;
}
public void setUnk(int unk) {
this.unk = unk;
public void setFh(int fh) {
this.fh = fh;
}
@Override
@@ -44,7 +44,7 @@ public class ChairMovement extends AbstractLifeMovement {
lew.write(getType());
lew.writeShort(getPosition().x);
lew.writeShort(getPosition().y);
lew.writeShort(unk);
lew.writeShort(fh);
lew.write(getNewstate());
lew.writeShort(getDuration());
}
src/server/movement/JumpDownMovement.java
+12 -12
View File
@@ -26,8 +26,8 @@ import tools.data.output.LittleEndianWriter;
public class JumpDownMovement extends AbstractLifeMovement {
private Point pixelsPerSecond;
private int unk;
private int fh;
private int originFh;
public JumpDownMovement(int type, Point position, int duration, int newstate) {
super(type, position, duration, newstate);
@@ -41,22 +41,22 @@ public class JumpDownMovement extends AbstractLifeMovement {
this.pixelsPerSecond = wobble;
}
public int getUnk() {
return unk;
}
public void setUnk(int unk) {
this.unk = unk;
}
public int getFH() {
public int getFh() {
return fh;
}
public void setFH(int fh) {
public void setFh(int fh) {
this.fh = fh;
}
public int getOriginFh() {
return originFh;
}
public void setOriginFh(int fh) { // fh actually originFh, thanks Spoon for pointing this out
this.originFh = fh;
}
@Override
public void serialize(LittleEndianWriter lew) {
lew.write(getType());
@@ -64,8 +64,8 @@ public class JumpDownMovement extends AbstractLifeMovement {
lew.writeShort(getPosition().y);
lew.writeShort(pixelsPerSecond.x);
lew.writeShort(pixelsPerSecond.y);
lew.writeShort(unk);
lew.writeShort(fh);
lew.writeShort(originFh);
lew.write(getNewstate());
lew.writeShort(getDuration());
}
src/server/quest/actions/ExpAction.java
+5 -11
View File
@@ -23,7 +23,6 @@ package server.quest.actions;
import client.MapleCharacter;
import constants.ServerConstants;
import net.server.world.World;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -53,15 +52,10 @@ public class ExpAction extends MapleQuestAction {
}
public static void runAction(MapleCharacter chr, int gain) {
if (chr.isBeginnerJob() && chr.getLevel() < 10) {
chr.gainExp(gain, true, true);
} else {
if(!ServerConstants.USE_QUEST_RATE) {
chr.gainExp(gain * chr.getExpRate(), true, true);
} else {
World w = chr.getClient().getWorldServer();
chr.gainExp(gain * w.getExpRate() * w.getQuestRate(), true, true);
}
}
if (!ServerConstants.USE_QUEST_RATE) {
chr.gainExp(gain * chr.getExpRate(), true, true);
} else {
chr.gainExp(gain * chr.getQuestExpRate(), true, true);
}
}
}
src/server/quest/actions/MesoAction.java
+3 -5
View File
@@ -23,7 +23,6 @@ package server.quest.actions;
import client.MapleCharacter;
import constants.ServerConstants;
import net.server.world.World;
import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
@@ -54,14 +53,13 @@ public class MesoAction extends MapleQuestAction {
}
public static void runAction(MapleCharacter chr, int gain) {
if(gain < 0) {
if (gain < 0) {
chr.gainMeso(gain, true, false, true);
} else {
if(!ServerConstants.USE_QUEST_RATE) {
if (!ServerConstants.USE_QUEST_RATE) {
chr.gainMeso(gain * chr.getMesoRate(), true, false, true);
} else {
World w = chr.getClient().getWorldServer();
chr.gainMeso(gain * w.getMesoRate() * w.getQuestRate(), true, false, true);
chr.gainMeso(gain * chr.getQuestMesoRate(), true, false, true);
}
}
}