From c7048a09ac0e5002a6fa3926b91fcbd1afa3c830 Mon Sep 17 00:00:00 2001 From: ronancpl Date: Thu, 14 Nov 2019 23:57:28 -0300 Subject: [PATCH] Updating more credits --- src/client/autoban/AutobanManager.java | 2 -- src/client/command/commands/gm1/GotoCommand.java | 2 +- src/net/server/Server.java | 2 +- .../server/channel/handlers/AbstractDealDamageHandler.java | 2 +- .../channel/handlers/AbstractMovementPacketHandler.java | 2 +- src/net/server/channel/handlers/AcceptFamilyHandler.java | 2 +- src/net/server/channel/handlers/AdminCommandHandler.java | 2 +- src/net/server/channel/handlers/FamilySeparateHandler.java | 2 +- src/net/server/channel/handlers/MoveLifeHandler.java | 2 +- src/server/MapleItemInformationProvider.java | 2 +- src/server/maps/MapleMapFactory.java | 2 +- src/tools/MaplePacketCreator.java | 4 ++-- tools/ScriptQuestReleaseTracker/strmap.h | 6 +++--- 13 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/client/autoban/AutobanManager.java b/src/client/autoban/AutobanManager.java index 1e46a0d6d7..0318dd88c3 100644 --- a/src/client/autoban/AutobanManager.java +++ b/src/client/autoban/AutobanManager.java @@ -53,8 +53,6 @@ public class AutobanManager { if (points.get(fac) >= fac.getMaximum()) { chr.autoban(reason); - //chr.autoban("Autobanned for " + fac.name() + " ;" + reason, 1); - //chr.sendPolice("You have been blocked by #bMooplePolice for the HACK reason#k."); } } if (YamlConfig.config.server.USE_AUTOBAN_LOG) { diff --git a/src/client/command/commands/gm1/GotoCommand.java b/src/client/command/commands/gm1/GotoCommand.java index 986bc279bf..24df9a93d1 100644 --- a/src/client/command/commands/gm1/GotoCommand.java +++ b/src/client/command/commands/gm1/GotoCommand.java @@ -50,7 +50,7 @@ public class GotoCommand extends Command { sortGotoEntries(towns); try { - // thanks shavit for noticing goto areas getting loaded from wz needlessly, only for the name retrieval + // thanks shavit for noticing goto areas getting loaded from wz needlessly only for the name retrieval for (Map.Entry e : towns) { GOTO_TOWNS_INFO += ("'" + e.getKey() + "' - #b" + (MapleMapFactory.loadPlaceName(e.getValue())) + "#k\r\n"); diff --git a/src/net/server/Server.java b/src/net/server/Server.java index b8f0e62a50..fe3c162be9 100644 --- a/src/net/server/Server.java +++ b/src/net/server/Server.java @@ -858,7 +858,7 @@ public class Server { } catch (SQLException sqle) { sqle.printStackTrace(); } - applyAllNameChanges(); //name changes can be missed by INSTANT_NAME_CHANGE + applyAllNameChanges(); // -- name changes can be missed by INSTANT_NAME_CHANGE -- applyAllWorldTransfers(); //MaplePet.clearMissingPetsFromDb(); // thanks Optimist for noticing this taking too long to run MapleCashidGenerator.loadExistentCashIdsFromDb(); diff --git a/src/net/server/channel/handlers/AbstractDealDamageHandler.java b/src/net/server/channel/handlers/AbstractDealDamageHandler.java index d0455c3c99..c047db4765 100644 --- a/src/net/server/channel/handlers/AbstractDealDamageHandler.java +++ b/src/net/server/channel/handlers/AbstractDealDamageHandler.java @@ -164,7 +164,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl int mobCount = attackEffect.getMobCount(); if (attack.skill != Cleric.HEAL) { if (player.isAlive()) { - if(attack.skill == Aran.BODY_PRESSURE || attack.skill == Marauder.ENERGY_CHARGE || attack.skill == ThunderBreaker.ENERGY_CHARGE) { // thanks IxianMace for noticing Energy Charge skills refreshing on touch, leading to misleading buff applies + if(attack.skill == Aran.BODY_PRESSURE || attack.skill == Marauder.ENERGY_CHARGE || attack.skill == ThunderBreaker.ENERGY_CHARGE) { // thanks IxianMace for noticing Energy Charge skills refreshing on touch // prevent touch dmg skills refreshing } else if(attack.skill == NightWalker.POISON_BOMB) {// Poison Bomb attackEffect.applyTo(player, new Point(attack.position.x, attack.position.y)); diff --git a/src/net/server/channel/handlers/AbstractMovementPacketHandler.java b/src/net/server/channel/handlers/AbstractMovementPacketHandler.java index 2c56a360da..2936ba10af 100644 --- a/src/net/server/channel/handlers/AbstractMovementPacketHandler.java +++ b/src/net/server/channel/handlers/AbstractMovementPacketHandler.java @@ -205,7 +205,7 @@ public abstract class AbstractMovementPacketHandler extends AbstractMaplePacketH lea.skip(9); // jump down (?) break; case 10: // Change Equip - //ignored by server + //ignored server-side lea.readByte(); break; /*case 11: { // Chair diff --git a/src/net/server/channel/handlers/AcceptFamilyHandler.java b/src/net/server/channel/handlers/AcceptFamilyHandler.java index ebe120fb11..a0babdf6bd 100644 --- a/src/net/server/channel/handlers/AcceptFamilyHandler.java +++ b/src/net/server/channel/handlers/AcceptFamilyHandler.java @@ -105,7 +105,7 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler { newEntry.setSenior(inviterEntry, true); // save new family insertNewFamilyRecord(inviter.getId(), newFamily.getID(), 0, true); - insertNewFamilyRecord(chr.getId(), newFamily.getID(), inviter.getId(), false); // char was already saved by setSenior() above + insertNewFamilyRecord(chr.getId(), newFamily.getID(), inviter.getId(), false); // char was already saved from setSenior() above newFamily.setMessage("", true); } else { //new family for inviter, absorb invitee family insertNewFamilyRecord(inviter.getId(), newFamily.getID(), 0 , true); diff --git a/src/net/server/channel/handlers/AdminCommandHandler.java b/src/net/server/channel/handlers/AdminCommandHandler.java index 03a2f44c4d..d6f546f13b 100644 --- a/src/net/server/channel/handlers/AdminCommandHandler.java +++ b/src/net/server/channel/handlers/AdminCommandHandler.java @@ -102,7 +102,7 @@ public final class AdminCommandHandler extends AbstractMaplePacketHandler { c.announce(MaplePacketCreator.getGMEffect(6, (byte) 1)); } break; - case 0x10: // /h, information added by vana ... hide ofcourse + case 0x10: // /h, information added by vana -- ... hide ofcourse c.getPlayer().Hide(slea.readByte() == 1); break; case 0x11: // Entering a map diff --git a/src/net/server/channel/handlers/FamilySeparateHandler.java b/src/net/server/channel/handlers/FamilySeparateHandler.java index 93597f53d1..d50f4ec239 100644 --- a/src/net/server/channel/handlers/FamilySeparateHandler.java +++ b/src/net/server/channel/handlers/FamilySeparateHandler.java @@ -61,7 +61,7 @@ public class FamilySeparateHandler extends AbstractMaplePacketHandler { if(senior.getSenior() != null) senior.getSenior().gainReputation(-(repCost/2), false); forkOn.announceToSenior(MaplePacketCreator.serverNotice(5, forkOn.getName() + " has left the family."), true); forkOn.fork(); - c.announce(MaplePacketCreator.getFamilyInfo(forkOn)); //pedigree info will be requested by the client if the window is open + c.announce(MaplePacketCreator.getFamilyInfo(forkOn)); //pedigree info will be requested from the client if the window is open forkOn.updateSeniorFamilyInfo(true); c.announce(MaplePacketCreator.sendFamilyMessage(1, 0)); } diff --git a/src/net/server/channel/handlers/MoveLifeHandler.java b/src/net/server/channel/handlers/MoveLifeHandler.java index ebfd0a20ff..370bc3011b 100644 --- a/src/net/server/channel/handlers/MoveLifeHandler.java +++ b/src/net/server/channel/handlers/MoveLifeHandler.java @@ -160,7 +160,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler { try { long movementDataStart = slea.getPosition(); - updatePosition(slea, monster, -2); // Thanks Doodle and ZERO傑洛 for noticing sponge-based bosses moving out of stage in case of no-offset applied + updatePosition(slea, monster, -2); // Thanks Doodle & 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 slea.seek(movementDataStart); diff --git a/src/server/MapleItemInformationProvider.java b/src/server/MapleItemInformationProvider.java index f8d32d7ef1..9af8c82877 100644 --- a/src/server/MapleItemInformationProvider.java +++ b/src/server/MapleItemInformationProvider.java @@ -926,7 +926,7 @@ public class MapleItemInformationProvider { */ public boolean canUseCleanSlate(Equip nEquip) { Map eqstats = this.getEquipStats(nEquip.getItemId()); - return YamlConfig.config.server.USE_ENHANCED_CLNSLATE || nEquip.getUpgradeSlots() < (byte) (eqstats.get("tuc") + nEquip.getVicious()); // issue with clean slate found thanks to Masterrulax, vicious added in the check thanks to Crypter (CrypterDEV) + return YamlConfig.config.server.USE_ENHANCED_CLNSLATE || nEquip.getUpgradeSlots() < (byte) (eqstats.get("tuc") + nEquip.getVicious()); } public Item scrollEquipWithId(Item equip, int scrollId, boolean usingWhiteScroll, int vegaItemId, boolean isGM) { diff --git a/src/server/maps/MapleMapFactory.java b/src/server/maps/MapleMapFactory.java index dd483131d2..5117f81d8d 100644 --- a/src/server/maps/MapleMapFactory.java +++ b/src/server/maps/MapleMapFactory.java @@ -274,7 +274,7 @@ public class MapleMapFactory { MapleData mcData = mapData.getChildByPath("monsterCarnival"); if (mcData != null) { map.setDeathCP(MapleDataTool.getIntConvert("deathCP", mcData, 0)); - map.setMaxMobs(MapleDataTool.getIntConvert("mobGenMax", mcData, 20)); // thanks Atoot for noticing CPQ1 bf. 3 & 4 not accepting spawns due to undefined limits, Lame for noticing a need to cap mob spawns even on such undefined limits + map.setMaxMobs(MapleDataTool.getIntConvert("mobGenMax", mcData, 20)); // thanks Atoot for noticing CPQ1 bf. 3 and 4 not accepting spawns due to undefined limits, Lame for noticing a need to cap mob spawns even on such undefined limits map.setTimeDefault(MapleDataTool.getIntConvert("timeDefault", mcData, 0)); map.setTimeExpand(MapleDataTool.getIntConvert("timeExpand", mcData, 0)); map.setMaxReactors(MapleDataTool.getIntConvert("guardianGenMax", mcData, 16)); diff --git a/src/tools/MaplePacketCreator.java b/src/tools/MaplePacketCreator.java index 20d776223b..8ebe07bb69 100644 --- a/src/tools/MaplePacketCreator.java +++ b/src/tools/MaplePacketCreator.java @@ -2291,7 +2291,7 @@ public class MaplePacketCreator { private static void rebroadcastMovementList(LittleEndianWriter lew, SeekableLittleEndianAccessor slea, long movementDataLength) { //movement command length is sent by client, probably not a big issue? (could be calculated on server) - //if multiple write/reads are slow, could use a (cached?) byte[] buffer + //if multiple write/reads are slow, could use (and cache?) a byte[] buffer for(long i = 0; i < movementDataLength; i++) { lew.write(slea.readByte()); } @@ -3478,7 +3478,7 @@ public class MaplePacketCreator { return mplew.getPacket(); } - // thanks NPC Quiz packets thanks to Eric + // NPC Quiz packets thanks to Eric public static byte[] OnAskQuiz(int nSpeakerTypeID, int nSpeakerTemplateID, int nResCode, String sTitle, String sProblemText, String sHintText, int nMinInput, int nMaxInput, int tRemainInitialQuiz) { MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter(); mplew.writeShort(SendOpcode.NPC_TALK.getValue()); diff --git a/tools/ScriptQuestReleaseTracker/strmap.h b/tools/ScriptQuestReleaseTracker/strmap.h index b0ff19cbc5..66118af39e 100644 --- a/tools/ScriptQuestReleaseTracker/strmap.h +++ b/tools/ScriptQuestReleaseTracker/strmap.h @@ -54,10 +54,10 @@ typedef struct StrMap StrMap; * Parameters: * * key: A pointer to a null-terminated C string. The string must not - * be modified by the client. + * be modified. * * value: A pointer to a null-terminated C string. The string must - * not be modified by the client. + * not be modified. * * obj: A pointer to a client-specific object. This parameter may be * null. @@ -168,7 +168,7 @@ int sm_get_count(const StrMap *map); * map: A pointer to a string map. This parameter cannot be null. * * enum_func: A pointer to a callback function that will be - * called by this procedure once for every key associated + * called from this procedure once for every key associated * with a value. This parameter cannot be null. * * obj: A pointer to a client-specific object. This parameter will be