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

148
src/client/MapleCharacter.java
View File

@@ -273,7 +273,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
private ScheduledFuture<?> pendantOfSpirit = null; //1122017
private Lock chrLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CHR, true);
private Lock evtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_EVT, true);
private Lock petLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PET, true); // for meso & quest tasks as well
private Lock petLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PET, true);
private Lock prtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PRT);
private Lock cpnLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CPN);
private Map<Integer, Set<Integer>> excluded = new LinkedHashMap<>();
@@ -852,17 +852,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
List<Pair<MapleBuffStat, Integer>> ldsstat = Collections.singletonList(new Pair<MapleBuffStat, Integer>(MapleBuffStat.DARKSIGHT, 0));
getMap().broadcastGMMessage(this, MaplePacketCreator.giveForeignBuff(id, ldsstat), false);
for (MapleMonster mon : this.getControlledMonsters()) {
mon.lockMonster();
try {
mon.setController(null);
mon.setControllerHasAggro(false);
mon.setControllerKnowsAboutAggro(false);
mon.getMap().updateMonsterController(mon);
} finally {
mon.unlockMonster();
}
}
this.releaseControlledMonsters();
}
announce(MaplePacketCreator.enableActions());
}
@@ -1356,7 +1346,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}
mapEim.registerPlayer(this);
// thanks Thora for finding an issue with players not being actually warped into the target event map (rather sent to the event starting map)
mapEim.registerPlayer(this, false);
}
MapleMap to = target; // warps directly to the target intead of the target's map id, this allows GMs to patrol players inside instances.
@@ -1708,29 +1699,48 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}
public void checkMonsterAggro(MapleMonster monster) {
monster.lockMonster();
try {
if (!monster.isControllerHasAggro()) {
if (monster.getController() == this) {
monster.setControllerHasAggro(true);
} else {
monster.switchController(this, true);
}
public void controlMonster(MapleMonster monster) {
if (cpnLock.tryLock()) {
try {
controlled.add(monster);
} finally {
cpnLock.unlock();
}
} finally {
monster.unlockMonster();
}
}
public void controlMonster(MapleMonster monster, boolean aggro) {
monster.lockMonster();
public void stopControllingMonster(MapleMonster monster) {
if (cpnLock.tryLock()) {
try {
controlled.remove(monster);
} finally {
cpnLock.unlock();
}
}
}
public int getNumControlledMonsters() {
cpnLock.lock();
try {
monster.setController(this);
controlled.add(monster);
client.announce(MaplePacketCreator.controlMonster(monster, false, aggro));
return controlled.size();
} finally {
monster.unlockMonster();
cpnLock.unlock();
}
}
public void releaseControlledMonsters() {
Collection<MapleMonster> controlledMonsters;
cpnLock.lock();
try {
controlledMonsters = new ArrayList<>(controlled);
controlled.clear();
} finally {
cpnLock.unlock();
}
for (MapleMonster monster : controlledMonsters) {
monster.aggroRedirectController();
}
}
@@ -2967,6 +2977,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}
public boolean canHoldMeso(int gain) { // thanks lucasziron found pointing out a need to check space availability for mesos on player transactions
long nextMeso = (long) meso.get() + gain;
return nextMeso <= Integer.MAX_VALUE;
}
public void gainMeso(int gain) {
gainMeso(gain, true, false, true);
}
@@ -4124,11 +4139,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return Collections.unmodifiableList(ret);
}
}
public Collection<MapleMonster> getControlledMonsters() {
return Collections.unmodifiableCollection(controlled);
}
public List<MapleRing> getCrushRings() {
Collections.sort(crushRings);
return crushRings;
@@ -4343,7 +4354,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return gachaexp.get();
}
public boolean hasNoviceExpRate() {
return ServerConstants.USE_ENFORCE_NOVICE_EXPRATE && isBeginnerJob() && level < 11;
}
public int getExpRate() {
if (hasNoviceExpRate()) { // base exp rate 1x for early levels idea thanks to Vcoc
return 1;
}
return expRate;
}
@@ -4383,7 +4402,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public int getRawMesoRate() {
return mesoRate / (mesoCoupon * getWorldServer().getMesoRate());
}
public int getQuestExpRate() {
World w = getWorldServer();
return w.getExpRate() * w.getQuestRate();
}
public int getQuestMesoRate() {
World w = getWorldServer();
return w.getMesoRate() * w.getQuestRate();
}
public int getFace() {
return face;
}
@@ -4829,10 +4858,6 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}
public int getNumControlledMonsters() {
return controlled.size();
}
public MapleParty getParty() {
prtLock.lock();
try {
@@ -5635,9 +5660,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public boolean isGuildLeader() { // true on guild master or jr. master
return guildid > 0 && guildRank < 3;
}
public void leaveMap() {
controlled.clear();
releaseControlledMonsters();
visibleMapObjects.clear();
setChair(0);
if (hpDecreaseTask != null) {
@@ -7772,17 +7797,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
throw new RuntimeException("Character not in database (" + id + ")");
}
List<MaplePet> petList = new LinkedList<>();
petLock.lock();
try {
for (int i = 0; i < 3; i++) {
if (pets[i] != null) {
pets[i].saveToDb();
petList.add(pets[i]);
}
}
} finally {
petLock.unlock();
}
for (MaplePet pet : petList) {
pet.saveToDb();
}
for(Entry<Integer, Set<Integer>> es: getExcluded().entrySet()) { // this set is already protected
try (PreparedStatement ps2 = con.prepareStatement("DELETE FROM petignores WHERE petid=?")) {
ps2.setInt(1, es.getKey());
@@ -8912,11 +8942,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}, duration);
}
public void stopControllingMonster(MapleMonster monster) {
controlled.remove(monster);
}
public void unequipAllPets() {
for (int i = 0; i < 3; i++) {
MaplePet pet = getPet(i);
@@ -9046,19 +9072,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void cancelQuestExpirationTask() {
petLock.lock();
evtLock.lock();
try {
if (questExpireTask != null) {
questExpireTask.cancel(false);
questExpireTask = null;
}
} finally {
petLock.unlock();
evtLock.unlock();
}
}
public void forfeitExpirableQuests() {
petLock.lock();
evtLock.lock();
try {
for(MapleQuest quest : questExpirations.keySet()) {
quest.forfeit(this);
@@ -9066,12 +9092,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
questExpirations.clear();
} finally {
petLock.unlock();
evtLock.unlock();
}
}
public void questExpirationTask() {
petLock.lock();
evtLock.lock();
try {
if(!questExpirations.isEmpty()) {
if(questExpireTask == null) {
@@ -9084,12 +9110,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}
} finally {
petLock.unlock();
evtLock.unlock();
}
}
private void runQuestExpireTask() {
petLock.lock();
evtLock.lock();
try {
long timeNow = Server.getInstance().getCurrentTime();
List<MapleQuest> expireList = new LinkedList<>();
@@ -9110,12 +9136,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}
} finally {
petLock.unlock();
evtLock.unlock();
}
}
private void registerQuestExpire(MapleQuest quest, long time) {
petLock.lock();
evtLock.lock();
try {
if(questExpireTask == null) {
questExpireTask = TimerManager.getInstance().register(new Runnable() {
@@ -9128,7 +9154,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
questExpirations.put(quest, Server.getInstance().getCurrentTime() + time);
} finally {
petLock.unlock();
evtLock.unlock();
}
}
@@ -9671,7 +9697,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (pendantOfSpirit != null) { pendantOfSpirit.cancel(true); }
pendantOfSpirit = null;
petLock.lock();
evtLock.lock();
try {
if (questExpireTask != null) {
questExpireTask.cancel(false);
@@ -9681,7 +9707,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
questExpirations = null;
}
} finally {
petLock.unlock();
evtLock.unlock();
}
if (maplemount != null) {

14
src/client/MapleClient.java
View File

@@ -175,22 +175,22 @@ public class MapleClient {
return chars;
}
public List<String> loadCharacterNames(int serverId) {
public List<String> loadCharacterNames(int worldId) {
List<String> chars = new ArrayList<>(15);
for (CharNameAndId cni : loadCharactersInternal(serverId)) {
for (CharNameAndId cni : loadCharactersInternal(worldId)) {
chars.add(cni.name);
}
return chars;
}
private List<CharNameAndId> loadCharactersInternal(int serverId) {
private List<CharNameAndId> loadCharactersInternal(int worldId) {
PreparedStatement ps;
List<CharNameAndId> chars = new ArrayList<>(15);
try {
Connection con = DatabaseConnection.getConnection();
ps = con.prepareStatement("SELECT id, name FROM characters WHERE accountid = ? AND world = ?");
ps.setInt(1, this.getAccID());
ps.setInt(2, serverId);
ps.setInt(2, worldId);
try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) {
chars.add(new CharNameAndId(rs.getString("name"), rs.getInt("id")));
@@ -882,7 +882,7 @@ public class MapleClient {
}
public final void disconnect(final boolean shutdown, final boolean cashshop) {
if (isDisconnecting()) {
if (canDisconnect()) {
ThreadManager.getInstance().newTask(new Runnable() {
@Override
public void run() {
@@ -893,12 +893,12 @@ public class MapleClient {
}
public final void forceDisconnect() {
if (isDisconnecting()) {
if (canDisconnect()) {
disconnectInternal(true, false);
}
}
private synchronized boolean isDisconnecting() {
private synchronized boolean canDisconnect() {
if (disconnecting) {
return false;
}

2
src/client/command/commands/gm0/RatesCommand.java
View File

@@ -39,7 +39,7 @@ public class RatesCommand extends Command {
// travel rates not applicable since it's intrinsically a server/environment rate rather than a character rate
String showMsg_ = "#eCHARACTER RATES#n" + "\r\n\r\n";
showMsg_ += "EXP Rate: #e#b" + player.getExpRate() + "x#k#n" + "\r\n";
showMsg_ += "EXP Rate: #e#b" + player.getExpRate() + "x#k#n" + (player.hasNoviceExpRate() ? " - novice rate" : "") + "\r\n";
showMsg_ += "MESO Rate: #e#b" + player.getMesoRate() + "x#k#n" + "\r\n";
showMsg_ += "DROP Rate: #e#b" + player.getDropRate() + "x#k#n" + "\r\n";
showMsg_ += "BOSS DROP Rate: #e#b" + player.getBossDropRate() + "x#k#n" + "\r\n";

4
src/client/command/commands/gm0/ShowRatesCommand.java
View File

@@ -40,7 +40,7 @@ public class ShowRatesCommand extends Command {
showMsg += "World EXP Rate: #k" + c.getWorldServer().getExpRate() + "x#k" + "\r\n";
showMsg += "Player EXP Rate: #k" + player.getRawExpRate() + "x#k" + "\r\n";
if(player.getCouponExpRate() != 1) showMsg += "Coupon EXP Rate: #k" + player.getCouponExpRate() + "x#k" + "\r\n";
showMsg += "EXP Rate: #e#b" + player.getExpRate() + "x#k#n" + "\r\n";
showMsg += "EXP Rate: #e#b" + player.getExpRate() + "x#k#n" + (player.hasNoviceExpRate() ? " - novice rate" : "") + "\r\n";
showMsg += "\r\n" + "#eMESO RATE#n" + "\r\n";
showMsg += "World MESO Rate: #k" + c.getWorldServer().getMesoRate() + "x#k" + "\r\n";
@@ -66,7 +66,7 @@ public class ShowRatesCommand extends Command {
}
showMsg += "\r\n";
showMsg += "World TRAVEL Rate: #e#b" + c.getWorldServer().getTravelRate() + "x#k#n" + "\r\nServer\r\nPlayer";
showMsg += "World TRAVEL Rate: #e#b" + c.getWorldServer().getTravelRate() + "x#k#n" + "\r\n";
player.showHint(showMsg, 300);
}

9
src/client/command/commands/gm1/GotoCommand.java
View File

@@ -41,8 +41,6 @@ public class GotoCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
final HashMap<String, Integer> gotomaps = GameConstants.GOTO_MAPS;
MapleCharacter player = c.getPlayer();
if (params.length < 1){
player.yellowMessage("Syntax: @goto <map name>");
@@ -54,6 +52,13 @@ public class GotoCommand extends Command {
return;
}
HashMap<String, Integer> gotomaps;
if (player.isGM()) {
gotomaps = new HashMap<>(GameConstants.GOTO_AREAS); // distinct map registry for GM/users suggested thanks to Vcoc
} else {
gotomaps = new HashMap<>(GameConstants.GOTO_TOWNS);
}
if (gotomaps.containsKey(params[0])) {
MapleMap target = c.getChannelServer().getMapFactory().getMap(gotomaps.get(params[0]));

36
src/client/command/commands/gm2/SummonCommand.java
View File

@@ -26,6 +26,7 @@ package client.command.commands.gm2;
import client.command.Command;
import client.MapleClient;
import client.MapleCharacter;
import server.maps.MapleMap;
import net.server.Server;
import net.server.channel.Channel;
@@ -54,33 +55,26 @@ public class SummonCommand extends Command {
}
}
if (victim != null) {
boolean changingEvent = true;
if (victim.getEventInstance() != null) {
if (player.getEventInstance() != null && victim.getEventInstance().getLeaderId() == player.getEventInstance().getLeaderId()) {
changingEvent = false;
} else {
victim.getEventInstance().unregisterPlayer(victim);
}
if (!victim.isLoggedinWorld()) {
player.dropMessage(6, "Player currently not logged in or unreachable.");
return;
}
//Attempt to join the warpers instance.
if (player.getEventInstance() != null && changingEvent) {
if (player.getClient().getChannel() == victim.getClient().getChannel()) {
player.getEventInstance().registerPlayer(victim);
victim.saveLocationOnWarp();
victim.changeMap(player.getEventInstance().getMapInstance(player.getMapId()), player.getMap().findClosestPortal(player.getPosition()));
} else {
player.dropMessage("Target isn't on your channel, not able to warp into event instance.");
}
} else {//If victim isn't in an event instance or is in the same event instance as the one the caller is, just warp them.
victim.saveLocationOnWarp();
victim.changeMap(player.getMapId(), player.getMap().findClosestPortal(player.getPosition()));
}
if (player.getClient().getChannel() != victim.getClient().getChannel()) {//And then change channel if needed.
victim.dropMessage("Changing channel, please wait a moment.");
victim.getClient().changeChannel(player.getClient().getChannel());
}
try {
for (int i = 0; i < 7; i++) { // poll for a while until the player reconnects
if (victim.isLoggedinWorld()) break;
Thread.sleep(1777);
}
} catch (InterruptedException e) {}
MapleMap map = player.getMap();
victim.saveLocationOnWarp();
victim.forceChangeMap(map, map.findClosestPortal(player.getPosition()));
} else {
player.dropMessage(6, "Unknown player.");
}

3
src/client/command/commands/gm2/WarpAreaCommand.java
View File

@@ -29,7 +29,6 @@ import client.command.Command;
import server.maps.MapleMap;
import java.awt.*;
import java.util.ArrayList;
import java.util.Collection;
public class WarpAreaCommand extends Command {
@@ -54,7 +53,7 @@ public class WarpAreaCommand extends Command {
Point pos = player.getPosition();
Collection<MapleCharacter> characters = new ArrayList<>(player.getMap().getCharacters());
Collection<MapleCharacter> characters = player.getMap().getAllPlayers();
for (MapleCharacter victim : characters) {
if (victim.getPosition().distanceSq(pos) <= 50000) {

3
src/client/command/commands/gm2/WarpMapCommand.java
View File

@@ -28,7 +28,6 @@ import client.MapleClient;
import client.command.Command;
import server.maps.MapleMap;
import java.util.ArrayList;
import java.util.Collection;
public class WarpMapCommand extends Command {
@@ -51,7 +50,7 @@ public class WarpMapCommand extends Command {
return;
}
Collection<MapleCharacter> characters = new ArrayList<>(player.getMap().getCharacters());
Collection<MapleCharacter> characters = player.getMap().getAllPlayers();
for (MapleCharacter victim : characters) {
victim.saveLocationOnWarp();

8
src/client/command/commands/gm3/ExpedsCommand.java
View File

@@ -30,6 +30,8 @@ import net.server.Server;
import net.server.channel.Channel;
import server.expeditions.MapleExpedition;
import java.util.Map.Entry;
public class ExpedsCommand extends Command {
{
setDescription("");
@@ -53,11 +55,11 @@ public class ExpedsCommand extends Command {
player.yellowMessage(">> Size: " + exped.getMembers().size());
player.yellowMessage(">> Leader: " + exped.getLeader().getName());
int memId = 2;
for (MapleCharacter member : exped.getMembers()) {
if (exped.isLeader(member)) {
for (Entry<Integer, String> e : exped.getMembers().entrySet()) {
if (exped.isLeader(e.getKey())) {
continue;
}
player.yellowMessage(">>> Member " + memId + ": " + member.getName());
player.yellowMessage(">>> Member " + memId + ": " + e.getValue());
memId++;
}
}

3
src/client/command/commands/gm3/ReloadMapCommand.java
View File

@@ -28,7 +28,6 @@ import client.MapleClient;
import client.MapleCharacter;
import server.maps.MapleMap;
import java.util.ArrayList;
import java.util.Collection;
public class ReloadMapCommand extends Command {
@@ -42,7 +41,7 @@ public class ReloadMapCommand extends Command {
MapleMap newMap = c.getChannelServer().getMapFactory().resetMap(player.getMapId());
int callerid = c.getPlayer().getId();
Collection<MapleCharacter> characters = new ArrayList<>(player.getMap().getCharacters());
Collection<MapleCharacter> characters = player.getMap().getAllPlayers();
for (MapleCharacter chr : characters) {
chr.saveLocationOnWarp();

11
src/client/command/commands/gm3/WarpSnowBallCommand.java
View File

@@ -23,12 +23,11 @@
*/
package client.command.commands.gm3;
import client.command.Command;
import client.MapleClient;
import client.MapleCharacter;
import client.command.Command;
import client.MapleClient;
import client.MapleCharacter;
import java.util.ArrayList;
import java.util.List;
import java.util.List;
public class WarpSnowBallCommand extends Command {
{
@@ -38,7 +37,7 @@ public class WarpSnowBallCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
List<MapleCharacter> chars = new ArrayList<>(player.getMap().getCharacters());
List<MapleCharacter> chars = player.getMap().getAllPlayers();
for (MapleCharacter chr : chars) {
chr.saveLocationOnWarp();
chr.changeMap(109060000, chr.getTeam());

2
src/client/command/commands/gm5/DebugCommand.java
View File

@@ -72,7 +72,7 @@ public class DebugCommand extends Command {
for (MapleMapObject monstermo : monsters) {
MapleMonster monster = (MapleMonster) monstermo;
MapleCharacter controller = monster.getController();
player.message("Monster ID: " + monster.getId() + " Aggro target: " + ((controller != null) ? controller.getName() : "<none>"));
player.message("Monster ID: " + monster.getId() + " Aggro target: " + ((controller != null) ? controller.getName() + " Has aggro: " + monster.isControllerHasAggro() + " Knowns aggro: " + monster.isControllerKnowsAboutAggro() : "<none>"));
}
break;

11
src/client/inventory/Item.java
View File

@@ -56,8 +56,13 @@ public class Item implements Comparable<Item> {
this.id = id;
this.position = position;
this.quantity = quantity;
if (petid > -1) { // issue with null "pet" having petid > -1 found thanks to MedicOP
this.pet = MaplePet.loadFromDb(id, position, petid);
if (this.pet == null) {
petid = -1;
}
}
this.petid = petid;
if (petid > -1) this.pet = MaplePet.loadFromDb(id, position, petid);
this.flag = 0;
this.log = new LinkedList<>();
}
@@ -121,10 +126,6 @@ public class Item implements Comparable<Item> {
public int getPetId() {
return petid;
}
public void setPetId(int id) {
this.petid = id;
}
@Override
public int compareTo(Item other) {

112
src/client/processor/AssignAPProcessor.java
View File

@@ -134,10 +134,10 @@ public class AssignAPProcessor {
luk = scStat;
str = 0; dex = 0;
if(luk + chr.getLuk() > CAP) {
if(ServerConstants.USE_AUTOASSIGN_SECONDARY_CAP && luk + chr.getLuk() > CAP) {
temp = luk + chr.getLuk() - CAP;
luk -= temp;
int_ += temp;
scStat -= temp;
prStat += temp;
}
primary = MapleStat.INT;
@@ -160,10 +160,10 @@ public class AssignAPProcessor {
str = scStat;
int_ = 0; luk = 0;
if(str + chr.getStr() > CAP) {
if(ServerConstants.USE_AUTOASSIGN_SECONDARY_CAP && str + chr.getStr() > CAP) {
temp = str + chr.getStr() - CAP;
str -= temp;
dex += temp;
scStat -= temp;
prStat += temp;
}
primary = MapleStat.DEX;
@@ -186,10 +186,10 @@ public class AssignAPProcessor {
str = scStat;
int_ = 0; luk = 0;
if(str + chr.getStr() > CAP) {
if(ServerConstants.USE_AUTOASSIGN_SECONDARY_CAP && str + chr.getStr() > CAP) {
temp = str + chr.getStr() - CAP;
str -= temp;
dex += temp;
scStat -= temp;
prStat += temp;
}
primary = MapleStat.DEX;
@@ -240,15 +240,15 @@ public class AssignAPProcessor {
str = trStat;
int_ = 0;
if(dex + chr.getDex() > CAP) {
if(ServerConstants.USE_AUTOASSIGN_SECONDARY_CAP && dex + chr.getDex() > CAP) {
temp = dex + chr.getDex() - CAP;
dex -= temp;
luk += temp;
scStat -= temp;
prStat += temp;
}
if(str + chr.getStr() > CAP) {
if(ServerConstants.USE_AUTOASSIGN_SECONDARY_CAP && str + chr.getStr() > CAP) {
temp = str + chr.getStr() - CAP;
str -= temp;
luk += temp;
trStat -= temp;
prStat += temp;
}
primary = MapleStat.LUK;
@@ -258,50 +258,64 @@ public class AssignAPProcessor {
break;
case BRAWLER:
CAP = 120;
scStat = chr.getLevel() - (chr.getDex() + dex - eqpDex);
if(scStat < 0) scStat = 0;
scStat = Math.min(scStat, tempAp);
if(tempAp > scStat) tempAp -= scStat;
else tempAp = 0;
prStat = tempAp;
str = prStat;
dex = scStat;
int_ = 0; luk = 0;
if(dex + chr.getDex() > CAP) {
temp = dex + chr.getDex() - CAP;
dex -= temp;
str += temp;
}
primary = MapleStat.STR;
secondary = MapleStat.DEX;
break;
default: //warrior, beginner, ...
CAP = 80;
CAP = 300;
boolean highDex = false; // thanks lucasziron & Vcoc for finding out DEX autoassigning poorly for STR-based characters
if (chr.getLevel() < 40) {
if (chr.getDex() >= (2 * chr.getLevel()) + 2) {
highDex = true;
}
} else {
if (chr.getDex() >= chr.getLevel() + 42) {
highDex = true;
}
}
// other classes will start favoring more DEX only if a level-based threshold is reached.
if(!highDex) {
scStat = 0;
if(chr.getDex() < 80) {
scStat = (2 * chr.getLevel()) - (chr.getDex() + dex - eqpDex);
if(scStat < 0) scStat = 0;
scStat = ((2 * chr.getLevel()) / 3) - (chr.getDex() + dex - eqpDex);
if(scStat < 0) scStat = 0;
scStat = Math.min(scStat, tempAp);
scStat = Math.min(80 - chr.getDex(), scStat);
scStat = Math.min(tempAp, scStat);
tempAp -= scStat;
}
if(tempAp > scStat) tempAp -= scStat;
else tempAp = 0;
temp = (chr.getLevel() + 40) - Math.max(80, scStat + chr.getDex() + dex - eqpDex);
if(temp < 0) temp = 0;
temp = Math.min(tempAp, temp);
scStat += temp;
tempAp -= temp;
} else {
scStat = 0;
if(chr.getDex() < 96) {
scStat = (int)(2.4 * chr.getLevel()) - (chr.getDex() + dex - eqpDex);
if(scStat < 0) scStat = 0;
scStat = Math.min(96 - chr.getDex(), scStat);
scStat = Math.min(tempAp, scStat);
tempAp -= scStat;
}
temp = 96 + (int)(1.2 * (chr.getLevel() - 40)) - Math.max(96, scStat + chr.getDex() + dex - eqpDex);
if(temp < 0) temp = 0;
temp = Math.min(tempAp, temp);
scStat += temp;
tempAp -= temp;
}
prStat = tempAp;
str = prStat;
dex = scStat;
int_ = 0; luk = 0;
if(dex + chr.getDex() > CAP) {
if(ServerConstants.USE_AUTOASSIGN_SECONDARY_CAP && dex + chr.getDex() > CAP) {
temp = dex + chr.getDex() - CAP;
dex -= temp;
str += temp;
scStat -= temp;
prStat += temp;
}
primary = MapleStat.STR;

17
src/client/processor/DueyProcessor.java
View File

@@ -469,6 +469,11 @@ public class DueyProcessor {
}
if (dp.getItem() != null) {
if (!c.getPlayer().canHoldMeso(dp.getMesos())) {
c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode()));
return;
}
if (!MapleInventoryManipulator.checkSpace(c, dp.getItem().getItemId(), dp.getItem().getQuantity(), dp.getItem().getOwner())) {
int itemid = dp.getItem().getItemId();
if(MapleItemInformationProvider.getInstance().isPickupRestricted(itemid) && c.getPlayer().getInventory(ItemConstants.getInventoryType(itemid)).findById(itemid) != null) {
@@ -483,17 +488,7 @@ public class DueyProcessor {
}
}
long gainmesos;
long totalmesos = (long) dp.getMesos() + c.getPlayer().getMeso();
if (totalmesos < 0 || dp.getMesos() < 0) {
gainmesos = 0;
} else {
totalmesos = Math.min(totalmesos, Integer.MAX_VALUE);
gainmesos = totalmesos - c.getPlayer().getMeso();
}
c.getPlayer().gainMeso((int)gainmesos, false);
c.getPlayer().gainMeso(dp.getMesos(), false);
removeItemFromDB(packageid);
c.announce(MaplePacketCreator.removeItemFromDuey(false, packageid));

2
src/client/processor/FredrickProcessor.java
View File

@@ -47,7 +47,7 @@ import tools.Pair;
*/
public class FredrickProcessor {
private static boolean canRetrieveFromFredrick(MapleCharacter chr, List<Pair<Item, MapleInventoryType>> items) {
if (chr.getMeso() + chr.getMerchantMeso() < 0) {
if (!chr.canHoldMeso(chr.getMerchantMeso())) {
return false;
}
return MapleInventory.checkSpotsAndOwnership(chr, items);