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

Heal & Summons atk limit + Skills on change job + Java8 scripting fix

Browse Source 
Adjusted reactor drops, now performing spray-like for any reactor.
Revised usage of synchronized statements in several methods in the source.
Fixed a quest from the Aran questline using "password" system unpredictedly.
Fixed column name in table "reports".
Fixed commands "startquest" and "completequest" not using the quest's NPC in the talk window.
Fixed HP regen bonuses such as sauna robes and from Endure skill, when applied in maps with improved regen, leading to false-positives (with the heal on the player).
Fixed a recent typo on a property from HenesysPQ.
Fixed "Combat Step" effect showing twice for other players.
Fixed type-cast issues within some script-hubbing methods in some Java classes.
Reactivated an unused flag that ignores level difference when applying EXP gains to party players.
Fixed Gaviota not disappearing after attack, as defined in the description of the skill.
Fixed CPQ1 field 3 & 4 not allowing players to use summons/protectors.
Fixed exped leaders still receiving exped creation packets even though it was dismissed due to failure on starting (daily entry limit, other fail cases).
Fixed a locking issue that would show up due to a infinite loop case within the procedure that makes disappear items immediately if there were already many items on map.
Fixed several summon skills not using buff icons.
Fixed max damage calculation for summons getting extremely low values when either a player doesn't equip a weapon or attack value is too low.
Fixed explosive loots not taking effect at all, although loot drop-types were already implemented.
Fixed NPE cases when trying to update position of summons/dragons server-side.
Reviewed reactor reset of reactors that disappears for a while. They are now supposed to return immediately once issued a reset.
This commit is contained in:
ronancpl
2019-07-28 17:34:52 -03:00
parent 442d45bef2
commit 85812ba489
52 changed files with 475 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/MapleCharacter.java
+48 -21
View File
@@ -792,28 +792,31 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
return false;
}
public int calculateMaxBaseDamage(int watk, MapleWeaponType weapon) {
int mainstat, secondarystat;
if (getJob().isA(MapleJob.THIEF) && weapon == MapleWeaponType.DAGGER_OTHER) {
weapon = MapleWeaponType.DAGGER_THIEVES;
}
if (weapon == MapleWeaponType.BOW || weapon == MapleWeaponType.CROSSBOW || weapon == MapleWeaponType.GUN) {
mainstat = localdex;
secondarystat = localstr;
} else if (weapon == MapleWeaponType.CLAW || weapon == MapleWeaponType.DAGGER_THIEVES) {
mainstat = localluk;
secondarystat = localdex + localstr;
} else {
mainstat = localstr;
secondarystat = localdex;
}
return (int) (((weapon.getMaxDamageMultiplier() * mainstat + secondarystat) / 100.0) * watk);
}
public int calculateMaxBaseDamage(int watk) {
int maxbasedamage;
Item weapon_item = getInventory(MapleInventoryType.EQUIPPED).getItem((short) -11);
if (weapon_item != null) {
MapleWeaponType weapon = ii.getWeaponType(weapon_item.getItemId());
int mainstat, secondarystat;
if (getJob().isA(MapleJob.THIEF) && weapon == MapleWeaponType.DAGGER_OTHER) {
weapon = MapleWeaponType.DAGGER_THIEVES;
}
if (weapon == MapleWeaponType.BOW || weapon == MapleWeaponType.CROSSBOW || weapon == MapleWeaponType.GUN) {
mainstat = localdex;
secondarystat = localstr;
} else if (weapon == MapleWeaponType.CLAW || weapon == MapleWeaponType.DAGGER_THIEVES) {
mainstat = localluk;
secondarystat = localdex + localstr;
} else {
mainstat = localstr;
secondarystat = localdex;
}
maxbasedamage = (int) (((weapon.getMaxDamageMultiplier() * mainstat + secondarystat) / 100.0) * watk);
maxbasedamage = calculateMaxBaseDamage(watk, ii.getWeaponType(weapon_item.getItemId()));
} else {
if (job.isA(MapleJob.PIRATE) || job.isA(MapleJob.THUNDERBREAKER1)) {
double weapMulti = 3;
@@ -830,8 +833,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return maxbasedamage;
}
public int calculateMaxBaseMagicDamage() {
int maxbasedamage = getTotalMagic();
public int calculateMaxBaseMagicDamage(int matk) {
int maxbasedamage = matk;
int totalint = getTotalInt();
if (totalint > 2000) {
@@ -1110,6 +1113,29 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}
}
private void broadcastChangeJob() {
for (MapleCharacter chr : map.getAllPlayers()) {
MapleClient chrC = chr.getClient();
if (chrC != null) { // propagate new job 3rd-person effects (FJ, Aran 1st strike, etc)
this.sendDestroyData(chrC);
this.sendSpawnData(chrC);
}
}
TimerManager.getInstance().schedule(new Runnable() { // need to delay to ensure clientside has finished reloading character data
@Override
public void run() {
MapleCharacter thisChr = MapleCharacter.this;
MapleMap map = thisChr.getMap();
if (map != null) {
map.broadcastMessage(thisChr, MaplePacketCreator.showForeignEffect(thisChr.getId(), 8), false);
}
}
}, 777);
}
public synchronized void changeJob(MapleJob newJob) {
if (newJob == null) {
@@ -1222,7 +1248,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
setMasteries(this.job.getId());
guildUpdate();
getMap().broadcastMessage(this, MaplePacketCreator.showForeignEffect(this.getId(), 8), false);
broadcastChangeJob();
if (GameConstants.hasSPTable(newJob) && newJob.getId() != 2001) {
if (getBuffedValue(MapleBuffStat.MONSTER_RIDING) != null) {
@@ -7064,7 +7090,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
rs.close();
ps.close();
ps = con.prepareStatement("SELECT name, characterslots FROM accounts WHERE id = ?", Statement.RETURN_GENERATED_KEYS);
ps = con.prepareStatement("SELECT name, characterslots, language FROM accounts WHERE id = ?", Statement.RETURN_GENERATED_KEYS);
ps.setInt(1, ret.accountid);
rs = ps.executeQuery();
if (rs.next()) {
@@ -7072,6 +7098,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
retClient.setAccountName(rs.getString("name"));
retClient.setCharacterSlots(rs.getByte("characterslots"));
retClient.setLanguage(rs.getInt("language")); // thanks Zein for noticing user language not overriding default once player is in-game
}
rs.close();
ps.close();
src/client/MapleClient.java
+8 -2
View File
@@ -1285,12 +1285,18 @@ public class MapleClient {
actionsSemaphore.release();
}
public void lockEncoder() {
encoderLock.lock();
public boolean tryacquireEncoder() {
if (actionsSemaphore.tryAcquire()) {
encoderLock.lock();
return true;
} else {
return false;
}
}
public void unlockEncoder() {
encoderLock.unlock();
actionsSemaphore.release();
}
private static class CharNameAndId {
src/client/SkillFactory.java
+1
View File
@@ -180,6 +180,7 @@ public class SkillFactory {
case NightWalker.POISON_BOMB:
case NightWalker.VAMPIRE:
case ChiefBandit.CHAKRA:
case Aran.COMBAT_STEP:
case Evan.RECOVERY_AURA:
isBuff = false;
break;
src/client/command/CommandsExecutor.java
+1
View File
@@ -265,6 +265,7 @@ public class CommandsExecutor {
addCommand("unbug", 2, UnBugCommand.class);
addCommand("id", 2, IdCommand.class);
addCommand("gachalist", GachaListCommand.class);
addCommand("loot", LootCommand.class);
commandsNameDesc.add(levelCommandsCursor);
}
src/client/command/commands/gm3/QuestCompleteCommand.java
+8 -1
View File
@@ -26,6 +26,7 @@ package client.command.commands.gm3;
import client.command.Command;
import client.MapleClient;
import client.MapleCharacter;
import server.quest.MapleQuest;
public class QuestCompleteCommand extends Command {
{
@@ -44,7 +45,13 @@ public class QuestCompleteCommand extends Command {
int questId = Integer.parseInt(params[0]);
if (player.getQuestStatus(questId) == 1) {
c.getAbstractPlayerInteraction().forceCompleteQuest(questId);
MapleQuest quest = MapleQuest.getInstance(questId);
if (quest != null && quest.getNpcRequirement(true) != -1) {
c.getAbstractPlayerInteraction().forceCompleteQuest(questId, quest.getNpcRequirement(true));
} else {
c.getAbstractPlayerInteraction().forceCompleteQuest(questId);
}
player.dropMessage(5, "QUEST " + questId + " completed.");
} else {
player.dropMessage(5, "QUESTID " + questId + " not started or already completed.");
src/client/command/commands/gm3/QuestStartCommand.java
+8 -1
View File
@@ -26,6 +26,7 @@ package client.command.commands.gm3;
import client.command.Command;
import client.MapleClient;
import client.MapleCharacter;
import server.quest.MapleQuest;
public class QuestStartCommand extends Command {
{
@@ -44,7 +45,13 @@ public class QuestStartCommand extends Command {
int questid = Integer.parseInt(params[0]);
if (player.getQuestStatus(questid) == 0) {
c.getAbstractPlayerInteraction().forceStartQuest(questid);
MapleQuest quest = MapleQuest.getInstance(questid);
if (quest != null && quest.getNpcRequirement(false) != -1) {
c.getAbstractPlayerInteraction().forceStartQuest(questid, quest.getNpcRequirement(false));
} else {
c.getAbstractPlayerInteraction().forceStartQuest(questid);
}
player.dropMessage(5, "QUEST " + questid + " started.");
} else {
player.dropMessage(5, "QUESTID " + questid + " already started/completed.");
src/constants/skills/Aran.java
+1
View File
@@ -29,6 +29,7 @@ public class Aran {
public static final int DOUBLE_SWING = 21000002;
public static final int TRIPLE_SWING = 21100001;
public static final int COMBO_ABILITY = 21000000;
public static final int COMBAT_STEP = 21001001;
public static final int POLEARM_BOOSTER = 21001003;
public static final int MAPLE_WARRIOR = 21121000;
public static final int FREEZE_STANDING = 21121003;
src/net/mina/MaplePacketEncoder.java
+32 -32
View File
@@ -24,7 +24,6 @@ package net.mina;
import constants.ServerConstants;
import client.MapleClient;
import constants.OpcodeConstants;
import net.opcodes.SendOpcode;
import net.server.coordinator.MapleSessionCoordinator;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
@@ -43,40 +42,41 @@ public class MaplePacketEncoder implements ProtocolEncoder {
final MapleClient client = (MapleClient) session.getAttribute(MapleClient.CLIENT_KEY);
try {
client.lockEncoder();
try {
final MapleAESOFB send_crypto = client.getSendCrypto();
final byte[] input = (byte[]) message;
if (ServerConstants.USE_DEBUG_SHOW_PACKET) {
int packetLen = input.length;
int pHeader = readFirstShort(input);
String pHeaderStr = Integer.toHexString(pHeader).toUpperCase();
String op = lookupRecv(pHeader);
String Recv = "ServerSend:" + op + " [" + pHeaderStr + "] (" + packetLen + ")\r\n";
if (packetLen <= 50000) {
String RecvTo = Recv + HexTool.toString(input) + "\r\n" + HexTool.toStringFromAscii(input);
System.out.println(RecvTo);
if (op == null) {
System.out.println("UnknownPacket:" + RecvTo);
if (client.tryacquireEncoder()) {
try {
final MapleAESOFB send_crypto = client.getSendCrypto();
final byte[] input = (byte[]) message;
if (ServerConstants.USE_DEBUG_SHOW_PACKET) {
int packetLen = input.length;
int pHeader = readFirstShort(input);
String pHeaderStr = Integer.toHexString(pHeader).toUpperCase();
String op = lookupRecv(pHeader);
String Recv = "ServerSend:" + op + " [" + pHeaderStr + "] (" + packetLen + ")\r\n";
if (packetLen <= 50000) {
String RecvTo = Recv + HexTool.toString(input) + "\r\n" + HexTool.toStringFromAscii(input);
System.out.println(RecvTo);
if (op == null) {
System.out.println("UnknownPacket:" + RecvTo);
}
} else {
FilePrinter.print(FilePrinter.PACKET_STREAM + MapleSessionCoordinator.getSessionRemoteAddress(session) + ".txt", HexTool.toString(new byte[]{input[0], input[1]}) + " ...");
}
} else {
FilePrinter.print(FilePrinter.PACKET_STREAM + MapleSessionCoordinator.getSessionRemoteAddress(session) + ".txt", HexTool.toString(new byte[]{input[0], input[1]}) + " ...");
}
final byte[] unencrypted = new byte[input.length];
System.arraycopy(input, 0, unencrypted, 0, input.length);
final byte[] ret = new byte[unencrypted.length + 4];
final byte[] header = send_crypto.getPacketHeader(unencrypted.length);
MapleCustomEncryption.encryptData(unencrypted);
send_crypto.crypt(unencrypted);
System.arraycopy(header, 0, ret, 0, 4);
System.arraycopy(unencrypted, 0, ret, 4, unencrypted.length);
out.write(IoBuffer.wrap(ret));
} finally {
client.unlockEncoder();
}
final byte[] unencrypted = new byte[input.length];
System.arraycopy(input, 0, unencrypted, 0, input.length);
final byte[] ret = new byte[unencrypted.length + 4];
final byte[] header = send_crypto.getPacketHeader(unencrypted.length);
MapleCustomEncryption.encryptData(unencrypted);
send_crypto.crypt(unencrypted);
System.arraycopy(header, 0, ret, 0, 4);
System.arraycopy(unencrypted, 0, ret, 4, unencrypted.length);
out.write(IoBuffer.wrap(ret));
} finally {
client.unlockEncoder();
}
// System.arraycopy(unencrypted, 0, ret, 4, unencrypted.length);
// out.write(ByteBuffer.wrap(ret));
src/net/server/channel/Channel.java
+1
View File
@@ -460,6 +460,7 @@ public final class Channel {
}
expeditions.put(exped.getType(), exped);
exped.beginRegistration(); // thanks Conrad for noticing leader still receiving packets on failure-to-register cases
return true;
}
}
src/net/server/channel/handlers/AbstractDealDamageHandler.java
+7 -7
View File
@@ -134,8 +134,9 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
}
}
protected synchronized void applyAttack(AttackInfo attack, final MapleCharacter player, int attackCount) {
if (player.getMap().isOwnershipRestricted(player)) {
protected void applyAttack(AttackInfo attack, final MapleCharacter player, int attackCount) {
final MapleMap map = player.getMap();
if (map.isOwnershipRestricted(player)) {
return;
}
@@ -150,7 +151,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
theSkill = SkillFactory.getSkill(GameConstants.getHiddenSkill(attack.skill)); //returns back the skill id if its not a hidden skill so we are gucci
attackEffect = attack.getAttackEffect(player, theSkill);
if (attackEffect == null) {
player.getClient().announce(MaplePacketCreator.enableActions());
player.announce(MaplePacketCreator.enableActions());
return;
}
@@ -176,7 +177,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
}
}
} else {
player.getClient().announce(MaplePacketCreator.enableActions());
player.announce(MaplePacketCreator.enableActions());
}
}
@@ -195,7 +196,6 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
}*/
int totDamage = 0;
final MapleMap map = player.getMap();
if (attack.skill == ChiefBandit.MESO_EXPLOSION) {
int delay = 0;
@@ -308,7 +308,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
TimerManager.getInstance().schedule(new Runnable() {
@Override
public void run() {
player.getMap().spawnMesoDrop(Math.min((int) Math.max(((double) eachdf / (double) 20000) * (double) maxmeso, (double) 1), maxmeso), new Point((int) (monster.getPosition().getX() + Randomizer.nextInt(100) - 50), (int) (monster.getPosition().getY())), monster, player, true, (byte) 2);
map.spawnMesoDrop(Math.min((int) Math.max(((double) eachdf / (double) 20000) * (double) maxmeso, (double) 1), maxmeso), new Point((int) (monster.getPosition().getX() + Randomizer.nextInt(100) - 50), (int) (monster.getPosition().getY())), monster, player, true, (byte) 2);
}
}, delay);
delay += 100;
@@ -333,7 +333,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
List<MonsterDropEntry> toSteal = new ArrayList<>();
toSteal.add(mi.retrieveDrop(monster.getId()).get(i));
player.getMap().dropItemsFromMonster(toSteal, player, monster);
map.dropItemsFromMonster(toSteal, player, monster);
monster.addStolen(toSteal.get(0).itemId);
}
}
src/net/server/channel/handlers/HealOvertimeHandler.java
+2 -1
View File
@@ -25,6 +25,7 @@ import client.MapleCharacter;
import client.MapleClient;
import client.autoban.AutobanFactory;
import client.autoban.AutobanManager;
import constants.GameConstants;
import net.AbstractMaplePacketHandler;
import net.server.Server;
import server.maps.MapleMapFactory;
@@ -46,7 +47,7 @@ public final class HealOvertimeHandler extends AbstractMaplePacketHandler {
abm.setTimestamp(8, timestamp, 28); // thanks Vcoc & Thora for pointing out d/c happening here
if ((abm.getLastSpam(0) + 1500) > timestamp) AutobanFactory.FAST_HP_HEALING.addPoint(abm, "Fast hp healing");
int abHeal = 120 + (int)(20 * MapleMapFactory.getMapRecoveryRate(chr.getMapId())); // Sleepywood sauna and showa spa...
int abHeal = (int)(77 * MapleMapFactory.getMapRecoveryRate(chr.getMapId()) * 1.5); // thanks Ari for noticing players not getting healed in sauna in certain cases
if (healHP > abHeal) {
AutobanFactory.HIGH_HP_HEALING.autoban(chr, "Healing: " + healHP + "; Max is " + abHeal + ".");
return;
src/net/server/channel/handlers/MoveDragonHandler.java
+10 -8
View File
@@ -37,14 +37,16 @@ public class MoveDragonHandler extends AbstractMovementPacketHandler {
final Point startPos = new Point(slea.readShort(), slea.readShort());
long movementDataStart = slea.getPosition();
final MapleDragon dragon = chr.getDragon();
updatePosition(slea, dragon, 0);
long movementDataLength = slea.getPosition() - movementDataStart; //how many bytes were read by updatePosition
if (dragon != null && movementDataLength > 0) {
slea.seek(movementDataStart);
if (chr.isHidden()) {
chr.getMap().broadcastGMMessage(chr, MaplePacketCreator.moveDragon(dragon, startPos, slea, movementDataLength));
} else {
chr.getMap().broadcastMessage(chr, MaplePacketCreator.moveDragon(dragon, startPos, slea, movementDataLength), dragon.getPosition());
if (dragon != null) {
updatePosition(slea, dragon, 0);
long movementDataLength = slea.getPosition() - movementDataStart; //how many bytes were read by updatePosition
if (movementDataLength > 0) {
slea.seek(movementDataStart);
if (chr.isHidden()) {
chr.getMap().broadcastGMMessage(chr, MaplePacketCreator.moveDragon(dragon, startPos, slea, movementDataLength));
} else {
chr.getMap().broadcastMessage(chr, MaplePacketCreator.moveDragon(dragon, startPos, slea, movementDataLength), dragon.getPosition());
}
}
}
}
src/net/server/channel/handlers/MoveLifeHandler.java
+9 -8
View File
@@ -143,14 +143,15 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
Point startPos = new Point(start_x, start_y - 2);
Point serverStartPos = new Point(monster.getPosition());
long movementDataStart = slea.getPosition();
updatePosition(slea, monster, -2);
long movementDataLength = slea.getPosition() - movementDataStart; //how many bytes were read by updatePosition
Boolean aggro = monster.aggroMoveLifeUpdate(player);
if (aggro == null) return;
if (nextUse != null) {
c.announce(MaplePacketCreator.moveMonsterResponse(objectid, moveid, mobMp, aggro, nextSkillId, nextSkillLevel));
updatePosition(slea, monster, -2); // Thanks Doodle and ZERO傑洛 for noticing sponge-based bosses moving out of stage in case of no-offset applied
long movementDataLength = slea.getPosition() - movementDataStart; //how many bytes were read by updatePosition
Boolean aggro = monster.aggroMoveLifeUpdate(player);
if (aggro == null) return;
if (nextUse != null) {
c.announce(MaplePacketCreator.moveMonsterResponse(objectid, moveid, mobMp, aggro, nextSkillId, nextSkillLevel));
} else {
c.announce(MaplePacketCreator.moveMonsterResponse(objectid, moveid, mobMp, aggro));
}
src/net/server/channel/handlers/MoveSummonHandler.java
+3 -3
View File
@@ -44,10 +44,10 @@ public final class MoveSummonHandler extends AbstractMovementPacketHandler {
break;
}
}
long movementDataStart = slea.getPosition();
updatePosition(slea, summon, 0);
long movementDataLength = slea.getPosition() - movementDataStart; //how many bytes were read by updatePosition
if (summon != null) {
long movementDataStart = slea.getPosition();
updatePosition(slea, summon, 0);
long movementDataLength = slea.getPosition() - movementDataStart; //how many bytes were read by updatePosition
slea.seek(movementDataStart);
player.getMap().broadcastMessage(player, MaplePacketCreator.moveSummon(player.getId(), oid, startPos, slea, movementDataLength), summon.getPosition());
}
src/net/server/channel/handlers/PetExcludeItemsHandler.java
+2
View File
@@ -33,6 +33,8 @@ import tools.data.input.SeekableLittleEndianAccessor;
* @author Ronan
*/
public final class PetExcludeItemsHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
final int petId = slea.readInt();
slea.skip(4);
src/net/server/channel/handlers/PlayerLoggedinHandler.java
+1
View File
@@ -203,6 +203,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
}
if (!newcomer) {
c.setLanguage(player.getClient().getLanguage());
c.setCharacterSlots((byte) player.getClient().getCharacterSlots());
player.newClient(c);
}
src/net/server/channel/handlers/SummonDamageHandler.java
+21 -2
View File
@@ -26,9 +26,14 @@ import client.MapleClient;
import client.Skill;
import client.SkillFactory;
import client.autoban.AutobanFactory;
import client.inventory.Item;
import client.inventory.MapleInventoryType;
import client.inventory.MapleWeaponType;
import client.status.MonsterStatusEffect;
import constants.skills.Outlaw;
import java.util.ArrayList;
import java.util.List;
import server.MapleItemInformationProvider;
import server.MapleStatEffect;
import server.life.MapleMonster;
import server.life.MapleMonsterInformationProvider;
@@ -115,15 +120,29 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler {
player.getMap().damageMonster(player, target, damage);
}
}
if (summon.getSkill() == Outlaw.GAVIOTA) { // thanks Periwinks for noticing Gaviota not cancelling after grenade toss
player.cancelEffect(summonEffect, false, -1);
}
}
private static int calcMaxDamage(MapleStatEffect summonEffect, MapleCharacter player, boolean magic) {
double maxDamage;
if (magic) {
maxDamage = player.calculateMaxBaseMagicDamage() * (0.05 * summonEffect.getMatk());
int matk = Math.max(player.getTotalMagic(), 14);
maxDamage = player.calculateMaxBaseMagicDamage(matk) * (0.05 * summonEffect.getMatk());
} else {
int maxBaseDmg = player.calculateMaxBaseDamage(player.getTotalWatk()); // thanks Conrad for detecting some summons legitimately hitting over the calculated limit
int watk = Math.max(player.getTotalWatk(), 14);
Item weapon_item = player.getInventory(MapleInventoryType.EQUIPPED).getItem((short) -11);
int maxBaseDmg; // thanks Conrad, Atoot for detecting some summons legitimately hitting over the calculated limit
if (weapon_item != null) {
maxBaseDmg = player.calculateMaxBaseDamage(watk, MapleItemInformationProvider.getInstance().getWeaponType(weapon_item.getItemId()));
} else {
maxBaseDmg = player.calculateMaxBaseDamage(watk, MapleWeaponType.SWORD1H);
}
float summonDmgMod = (maxBaseDmg >= 438) ? 0.054f : 0.077f;
maxDamage = maxBaseDmg * (summonDmgMod * summonEffect.getWatk());
}
src/net/server/coordinator/MapleMatchCheckerCoordinator.java
+1 -1
View File
@@ -300,7 +300,7 @@ public class MapleMatchCheckerCoordinator {
}
private void disposeMatchElement(MapleMatchCheckingElement mmce) {
Set<Integer> matchPlayers = mmce.getMatchPlayers();
Set<Integer> matchPlayers = mmce.getMatchPlayers(); // thanks Ai for noticing players getting match-stuck on certain cases
while (!poolMatchPlayers(matchPlayers)) {
try {
Thread.sleep(1000);
src/net/server/world/World.java
+3 -2
View File
@@ -47,6 +47,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
@@ -130,7 +131,7 @@ public class World {
private Set<Integer> queuedGuilds = new HashSet<>();
private Map<Integer, Pair<Pair<Boolean, Boolean>, Pair<Integer, Integer>>> queuedMarriages = new HashMap<>();
private Map<Integer, Set<Integer>> marriageGuests = new HashMap<>();
private Map<Integer, Set<Integer>> marriageGuests = new ConcurrentHashMap<>();
private Map<Integer, Integer> partyChars = new HashMap<>();
private Map<Integer, MapleParty> parties = new HashMap<>();
@@ -720,7 +721,7 @@ public class World {
return new Pair<>(type, guests);
}
public synchronized boolean addMarriageGuest(int marriageId, int playerId) {
public boolean addMarriageGuest(int marriageId, int playerId) {
Set<Integer> guests = marriageGuests.get(marriageId);
if(guests != null) {
if(guests.contains(playerId)) return false;
src/scripting/AbstractPlayerInteraction.java
+28 -10
View File
@@ -236,25 +236,43 @@ public class AbstractPlayerInteraction {
return canHoldAllAfterRemoving(Collections.singletonList(itemid), Collections.singletonList(quantity), Collections.singletonList(removeItemid), Collections.singletonList(removeQuantity));
}
private List<Integer> convertToIntegerArray(List<Double> list) {
List<Integer> intList = new LinkedList<>();
for(Double d: list) {
intList.add(d.intValue());
private List<Integer> convertToIntegerArray(List<Object> list) {
List<Integer> intList = new ArrayList<>(); // JAVA 7 Rhino script engine. Thanks Bruno, felipepm10 for noticing a typecast issue here.
if (ServerConstants.JAVA_8) {
for (Object d: list) {
intList.add(((Integer) d).intValue());
}
} else {
for (Object d: list) {
intList.add(((Double) d).intValue());
}
}
return intList;
}
public boolean canHoldAll(List<Double> itemids) {
List<Double> quantity = new LinkedList<>();
for (int i = 0; i < itemids.size(); i++) {
quantity.add(1.0);
public boolean canHoldAll(List<Object> itemids) {
List<Object> quantity = new LinkedList<>();
if (ServerConstants.JAVA_8) {
Integer intOne = 1;
for (int i = 0; i < itemids.size(); i++) {
quantity.add(intOne);
}
} else {
Double doubleOne = 1.0;
for (int i = 0; i < itemids.size(); i++) {
quantity.add(doubleOne);
}
}
return canHoldAll(itemids, quantity);
}
public boolean canHoldAll(List<Double> itemids, List<Double> quantity) {
public boolean canHoldAll(List<Object> itemids, List<Object> quantity) {
return canHoldAll(convertToIntegerArray(itemids), convertToIntegerArray(quantity), true);
}
src/scripting/event/EventInstanceManager.java
+20 -16
View File
@@ -911,24 +911,28 @@ public class EventInstanceManager {
return(MapleLifeFactory.getMonster(mid));
}
private List<Integer> convertToIntegerArray(List<Double> list) {
List<Integer> intList;
if(ServerConstants.JAVA_8)
intList=new ArrayList<Integer> (new ArrayList(java.util.Arrays.asList(list.toArray())));
else
{
intList = new ArrayList<>();
for(Double d: list) intList.add(d.intValue());
private List<Integer> convertToIntegerArray(List<Object> list) {
List<Integer> intList = new ArrayList<>();
if (ServerConstants.JAVA_8) {
for (Object d: list) {
intList.add(((Integer) d).intValue());
}
} else {
for (Object d: list) {
intList.add(((Double) d).intValue());
}
}
return intList;
return intList;
}
public void setEventClearStageExp(List<Double> gain) {
public void setEventClearStageExp(List<Object> gain) {
onMapClearExp.clear();
onMapClearExp.addAll(convertToIntegerArray(gain));
}
public void setEventClearStageMeso(List<Double> gain) {
public void setEventClearStageMeso(List<Object> gain) {
onMapClearMeso.clear();
onMapClearMeso.addAll(convertToIntegerArray(gain));
}
@@ -959,7 +963,7 @@ public class EventInstanceManager {
}
}
public final void setExclusiveItems(List<Double> items) {
public final void setExclusiveItems(List<Object> items) {
List<Integer> exclusive = convertToIntegerArray(items);
wL.lock();
@@ -972,19 +976,19 @@ public class EventInstanceManager {
}
}
public final void setEventRewards(List<Double> rwds, List<Double> qtys, int expGiven) {
public final void setEventRewards(List<Object> rwds, List<Object> qtys, int expGiven) {
setEventRewards(1, rwds, qtys, expGiven);
}
public final void setEventRewards(List<Double> rwds, List<Double> qtys) {
public final void setEventRewards(List<Object> rwds, List<Object> qtys) {
setEventRewards(1, rwds, qtys);
}
public final void setEventRewards(int eventLevel, List<Double> rwds, List<Double> qtys) {
public final void setEventRewards(int eventLevel, List<Object> rwds, List<Object> qtys) {
setEventRewards(eventLevel, rwds, qtys, 0);
}
public final void setEventRewards(int eventLevel, List<Double> rwds, List<Double> qtys, int expGiven) {
public final void setEventRewards(int eventLevel, List<Object> rwds, List<Object> qtys, int expGiven) {
// fixed EXP will be rewarded at the same time the random item is given
if(eventLevel <= 0 || eventLevel > ServerConstants.MAX_EVENT_LEVELS) return;
src/scripting/event/EventManager.java
+13 -4
View File
@@ -167,10 +167,19 @@ public class EventManager {
startLock = startLock.dispose();
}
private List<Integer> convertToIntegerArray(List<Double> list) {
private List<Integer> convertToIntegerArray(List<Object> list) {
List<Integer> intList = new ArrayList<>();
for(Double d: list) intList.add(d.intValue());
if (ServerConstants.JAVA_8) {
for (Object d: list) {
intList.add(((Integer) d).intValue());
}
} else {
for (Object d: list) {
intList.add(((Double) d).intValue());
}
}
return intList;
}
@@ -181,7 +190,7 @@ public class EventManager {
private List<Integer> getLobbyRange() {
try {
if (!ServerConstants.JAVA_8) {
return convertToIntegerArray((List<Double>)iv.invokeFunction("setLobbyRange", (Object) null));
return convertToIntegerArray((List<Object>)iv.invokeFunction("setLobbyRange", (Object) null));
} else { // java 8 support here thanks to MedicOP
ScriptObjectMirror object = (ScriptObjectMirror) iv.invokeFunction("setLobbyRange", (Object) null);
int[] to = object.to(int[].class);
src/scripting/npc/NPCConversationManager.java
+10 -1
View File
@@ -35,6 +35,7 @@ import provider.MapleDataProviderFactory;
import scripting.AbstractPlayerInteraction;
import server.MapleItemInformationProvider;
import server.MapleStatEffect;
import server.MapleShop;
import server.MapleShopFactory;
import server.events.gm.MapleEvent;
import server.gachapon.MapleGachapon;
@@ -83,6 +84,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import tools.FilePrinter;
/**
*
@@ -400,7 +402,14 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
}
public void openShopNPC(int id) {
MapleShopFactory.getInstance().getShop(id).sendShop(c);
MapleShop shop = MapleShopFactory.getInstance().getShop(id);
if (shop != null) {
shop.sendShop(c);
} else { // check for missing shopids thanks to resinate
FilePrinter.printError(FilePrinter.NPC_UNCODED, "Shop ID: " + id + " is missing from database.");
MapleShopFactory.getInstance().getShop(11000).sendShop(c);
}
}
public void maxMastery() {
src/scripting/reactor/ReactorActionManager.java
+1 -1
View File
@@ -105,7 +105,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
}
public void dropItems(int posX, int posY, boolean meso, int mesoChance, int minMeso, int maxMeso, int minItems) {
dropItems(false, posX, posY, meso, mesoChance, minMeso, maxMeso, minItems);
dropItems(true, posX, posY, meso, mesoChance, minMeso, maxMeso, minItems); // all reactors actually drop items sequentially... thanks inhyuk for pointing this out!
}
public void dropItems(boolean delayed, int posX, int posY, boolean meso, int mesoChance, final int minMeso, final int maxMeso, int minItems) {
src/scripting/reactor/ReactorScriptManager.java
+1 -1
View File
@@ -114,7 +114,7 @@ public class ReactorScriptManager extends AbstractScriptManager {
touching(c, reactor, false);
}
public synchronized void touching(MapleClient c, MapleReactor reactor, boolean touching) {
private void touching(MapleClient c, MapleReactor reactor, boolean touching) {
try {
Invocable iv = getInvocable("reactor/" + reactor.getId() + ".js", c);
if (iv == null) return;
src/server/MapleStatEffect.java
+5 -16
View File
@@ -1340,7 +1340,7 @@ public class MapleStatEffect {
if (localstatups.size() > 0) {
byte[] buff = null;
byte[] mbuff = null;
if (getSummonMovementType() == null && this.isActive(applyto)) {
if (this.isActive(applyto)) {
buff = MaplePacketCreator.giveBuff((skill ? sourceid : -sourceid), localDuration, localstatups);
}
if (isDash()) {
@@ -1390,11 +1390,10 @@ public class MapleStatEffect {
}
if (buff != null) {
if (!hasNoIcon()) { //Thanks flav for such a simple release! :)
applyto.announce(buff);
} else {
System.out.println("<Error> NO buff icon for id " + sourceid);
}
//Thanks flav for such a simple release! :)
//Thanks Conrad, Atoot for noticing summons not using buff icon
applyto.announce(buff);
}
long starttime = Server.getInstance().getCurrentTime();
@@ -1820,16 +1819,6 @@ public class MapleStatEffect {
return null;
}
public boolean hasNoIcon() {
return (sourceid == 3111002 || sourceid == 3211002 || + // puppet, puppet
sourceid == 3211005 || + // golden eagle
sourceid == 2121005 || sourceid == 2221005 || + // elquines, ifrit
sourceid == 2321003 || sourceid == 3121006 || + // bahamut, phoenix
sourceid == 3221005 || sourceid == 3111005 || + // frostprey, silver hawk
sourceid == 2311006 || sourceid == 5220002 || + // summon dragon, wrath of the octopi
sourceid == 5211001 || sourceid == 5211002); // octopus, gaviota
}
public boolean isSkill() {
return skill;
}
src/server/expeditions/MapleExpedition.java
+1 -2
View File
@@ -109,7 +109,6 @@ public class MapleExpedition {
minSize = (minPlayers != 0) ? minPlayers : type.getMinSize();
maxSize = (maxPlayers != 0) ? maxPlayers : type.getMaxSize();
bossLogs = new CopyOnWriteArrayList<>();
beginRegistration();
}
public int getMinSize() {
@@ -120,7 +119,7 @@ public class MapleExpedition {
return maxSize;
}
private void beginRegistration() {
public void beginRegistration() {
registering = true;
leader.announce(MaplePacketCreator.getClock(type.getRegistrationTime() * 60));
if (!silent) {
src/server/life/MapleMonster.java
+14 -7
View File
@@ -548,14 +548,21 @@ public class MapleMonster extends AbstractLoadedMapleLife {
int totalPartyLevel = 0;
// thanks G h o s t, Alfred, Vcoc, BHB for poiting out a bug in detecting party members after membership transactions in a party took place
for (MapleCharacter member : partyParticipation.keySet().iterator().next().getPartyMembersOnSameMap()) {
if (!leechInterval.inInterval(member.getLevel())) {
underleveled.add(member);
continue;
if (!ServerConstants.USE_ENFORCE_MOB_LEVEL_RANGE) {
for (MapleCharacter member : partyParticipation.keySet().iterator().next().getPartyMembersOnSameMap()) {
if (!leechInterval.inInterval(member.getLevel())) {
underleveled.add(member);
continue;
}
totalPartyLevel += member.getLevel();
expMembers.add(member);
}
} else { // thanks Ari for noticing unused server flag after EXP system overhaul
for (MapleCharacter member : partyParticipation.keySet().iterator().next().getPartyMembersOnSameMap()) {
totalPartyLevel += member.getLevel();
expMembers.add(member);
}
totalPartyLevel += member.getLevel();
expMembers.add(member);
}
int membersSize = expMembers.size();
src/server/maps/MapleMap.java
+19 -30
View File
@@ -387,9 +387,10 @@ public class MapleMap {
}
public void addMapObject(MapleMapObject mapobject) {
int curOID = getUsableOID();
objectWLock.lock();
try {
int curOID = getUsableOID();
mapobject.setObjectId(curOID);
this.mapobjects.put(curOID, mapobject);
} finally {
@@ -413,11 +414,11 @@ public class MapleMap {
private void spawnAndAddRangedMapObject(MapleMapObject mapobject, DelayedPacketCreation packetbakery, SpawnCondition condition) {
List<MapleCharacter> inRangeCharacters = new LinkedList<>();
int curOID = getUsableOID();
chrRLock.lock();
objectWLock.lock();
try {
int curOID = getUsableOID();
mapobject.setObjectId(curOID);
this.mapobjects.put(curOID, mapobject);
for (MapleCharacter chr : characters) {
@@ -896,15 +897,16 @@ public class MapleMap {
return droppedItemCount.get();
}
private synchronized void instantiateItemDrop(MapleMapItem mdrop) {
private void instantiateItemDrop(MapleMapItem mdrop) {
if(droppedItemCount.get() >= ServerConstants.ITEM_LIMIT_ON_MAP) {
MapleMapObject mapobj;
do {
mapobj = null;
objectWLock.lock();
try {
mapobj = registeredDrops.remove(0).get();
while(mapobj == null) {
while (mapobj == null) {
if (registeredDrops.isEmpty()) {
break;
}
@@ -1576,18 +1578,11 @@ public class MapleMap {
public void destroyReactor(int oid) {
final MapleReactor reactor = getReactorByOid(oid);
broadcastMessage(MaplePacketCreator.destroyReactor(reactor));
reactor.cancelReactorTimeout();
reactor.setAlive(false);
removeMapObject(reactor);
if (reactor.getDelay() > 0) {
registerMapSchedule(new Runnable() {
@Override
public void run() {
respawnReactor(reactor);
}
}, reactor.getDelay());
if (reactor != null) {
if (reactor.destroy()) {
removeMapObject(reactor);
}
}
}
@@ -1611,9 +1606,14 @@ public class MapleMap {
public final void resetReactors(List<MapleReactor> list) {
for (MapleReactor r : list) {
if (r.forceDelayedRespawn()) { // thanks Conrad for suggesting reactor with delay respawning immediately
continue;
}
r.lockReactor();
try {
r.resetReactorActions(0);
r.setAlive(true);
broadcastMessage(MaplePacketCreator.triggerReactor(r, 0));
} finally {
r.unlockReactor();
@@ -1742,7 +1742,7 @@ public class MapleMap {
public void destroyNPC(int npcid) { // assumption: there's at most one of the same NPC in a map.
List<MapleMapObject> npcs = getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.NPC));
chrRLock.lock();
objectWLock.lock();
try {
@@ -2106,19 +2106,6 @@ public class MapleMap {
c.announce(reactor.makeSpawnData());
}
});
}
private void respawnReactor(final MapleReactor reactor) {
reactor.lockReactor();
try {
reactor.resetReactorActions(0);
reactor.setAlive(true);
} finally {
reactor.unlockReactor();
}
spawnReactor(reactor);
}
public void spawnDoor(final MapleDoorObject door) {
@@ -2587,6 +2574,7 @@ public class MapleMap {
break;
}
}
chr.commitExcludedItems(); // thanks OishiiKawaiiDesu for noticing pet item ignore registry erasing upon changing maps
if (chr.getMonsterCarnival() != null) {
chr.getClient().announce(MaplePacketCreator.getClock(chr.getMonsterCarnival().getTimeLeftSeconds()));
@@ -3555,6 +3543,7 @@ public class MapleMap {
reactor.lockReactor();
try {
reactor.resetReactorActions(0);
reactor.setAlive(true);
broadcastMessage(MaplePacketCreator.triggerReactor(reactor, 0));
} finally {
reactor.unlockReactor();
src/server/maps/MapleMapFactory.java
+2 -2
View File
@@ -278,10 +278,10 @@ public class MapleMapFactory {
MapleData mcData = mapData.getChildByPath("monsterCarnival");
if (mcData != null) {
map.setDeathCP(MapleDataTool.getIntConvert("deathCP", mcData, 0));
map.setMaxMobs(MapleDataTool.getIntConvert("mobGenMax", mcData, 0));
map.setMaxMobs(MapleDataTool.getIntConvert("mobGenMax", mcData, Integer.MAX_VALUE)); // thanks Atoot for noticing CPQ1 bf. 3 & 4 not accepting spawns due to undefined limits
map.setTimeDefault(MapleDataTool.getIntConvert("timeDefault", mcData, 0));
map.setTimeExpand(MapleDataTool.getIntConvert("timeExpand", mcData, 0));
map.setMaxReactors(MapleDataTool.getIntConvert("guardianGenMax", mcData, 0));
map.setMaxReactors(MapleDataTool.getIntConvert("guardianGenMax", mcData, Integer.MAX_VALUE));
MapleData guardianGenData = mcData.getChildByPath("guardianGenPos");
for (MapleData node : guardianGenData.getChildren()) {
GuardianSpawnPoint pt = new GuardianSpawnPoint(new Point(MapleDataTool.getIntConvert("x", node), MapleDataTool.getIntConvert("y", node)));
src/server/maps/MapleReactor.java
+69 -1
View File
@@ -57,6 +57,7 @@ public class MapleReactor extends AbstractMapleMapObject {
private boolean shouldCollect;
private boolean attackHit;
private ScheduledFuture<?> timeoutTask = null;
private Runnable delayedRespawnRun = null;
private GuardianSpawnPoint guardian = null;
private byte facingDirection = 0;
private Lock reactorLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.REACTOR, true);
@@ -165,7 +166,9 @@ public class MapleReactor extends AbstractMapleMapObject {
@Override
public void sendSpawnData(MapleClient client) {
client.announce(makeSpawnData());
if (this.isAlive()) {
client.announce(makeSpawnData());
}
}
public final byte[] makeSpawnData() {
@@ -318,6 +321,71 @@ public class MapleReactor extends AbstractMapleMapObject {
e.printStackTrace();
}
}
public boolean destroy() {
if (reactorLock.tryLock()) {
try {
boolean alive = this.isAlive();
if (alive) {
this.setAlive(false);
this.cancelReactorTimeout();
if (this.getDelay() > 0) {
this.delayedRespawn();
}
} else if (this.inDelayedRespawn()) {
return false;
} else {
return true; // reactor neither alive nor in delayed respawn, remove map object allowed
}
} finally {
reactorLock.unlock();
}
}
map.broadcastMessage(MaplePacketCreator.destroyReactor(this));
return false;
}
private void respawn() {
this.lockReactor();
try {
this.resetReactorActions(0);
this.setAlive(true);
} finally {
this.unlockReactor();
}
map.broadcastMessage(this.makeSpawnData());
}
public void delayedRespawn() {
Runnable r = new Runnable() {
@Override
public void run() {
delayedRespawnRun = null;
respawn();
}
};
delayedRespawnRun = r;
map.getChannelServer().registerOverallAction(map.getId(), r, this.getDelay());
}
public boolean forceDelayedRespawn() {
Runnable r = delayedRespawnRun;
if (r != null) {
map.getChannelServer().forceRunOverallAction(map.getId(), r);
return true;
} else {
return false;
}
}
public boolean inDelayedRespawn() {
return delayedRespawnRun != null;
}
public Rectangle getArea() {
return new Rectangle(getPosition().x + stats.getTL().x, getPosition().y + stats.getTL().y, stats.getBR().x - stats.getTL().x, stats.getBR().y - stats.getTL().y);
src/server/partyquest/MonsterCarnival.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class MonsterCarnival {
public void run() {
timeUp();
}
}, (map.getTimeDefault() - 10) * 1000);
}, map.getTimeDefault() * 1000); // thanks Atoot for noticing an irregular "event extended" issue here
effectTimer = TimerManager.getInstance().schedule(new Runnable() {
@Override
public void run() {
src/tools/MaplePacketCreator.java
+7 -2
View File
@@ -337,7 +337,7 @@ public class MaplePacketCreator {
if (!viewall) {
mplew.write(0);
}
if (chr.isGM()) {
if (chr.isGM() || chr.isGmJob()) { // thanks Egg Daddy (Ubaware), resinate for noticing GM jobs crashing on non-GM players account
mplew.write(0);
return;
}
@@ -1811,6 +1811,11 @@ public class MaplePacketCreator {
}
public static byte[] dropItemFromMapObject(MapleCharacter player, MapleMapItem drop, Point dropfrom, Point dropto, byte mod) {
int dropType = drop.getDropType();
if (drop.hasClientsideOwnership(player) && dropType < 3) {
dropType = 2;
}
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.DROP_ITEM_FROM_MAPOBJECT.getValue());
mplew.write(mod);
@@ -1818,7 +1823,7 @@ public class MaplePacketCreator {
mplew.writeBool(drop.getMeso() > 0); // 1 mesos, 0 item, 2 and above all item meso bag,
mplew.writeInt(drop.getItemId()); // drop object ID
mplew.writeInt(drop.getClientsideOwnerId()); // owner charid/partyid :)
mplew.write(drop.hasClientsideOwnership(player) ? 2 : drop.getDropType()); // 0 = timeout for non-owner, 1 = timeout for non-owner's party, 2 = FFA, 3 = explosive/FFA
mplew.write(dropType); // 0 = timeout for non-owner, 1 = timeout for non-owner's party, 2 = FFA, 3 = explosive/FFA
mplew.writePos(dropto);
mplew.writeInt(drop.getDropper().getObjectId()); // dropper oid, found thanks to Li Jixue