Updating credits & missing aliases
This commit is contained in:
@@ -188,7 +188,7 @@ function action(mode, type, selection) {
|
|||||||
if (selection > 0) {
|
if (selection > 0) {
|
||||||
var banned = expedMembers.get(selection - 1);
|
var banned = expedMembers.get(selection - 1);
|
||||||
expedition.ban(banned);
|
expedition.ban(banned);
|
||||||
cm.sendOk("You have banned " + banned.getValue() + " from the expedition."); // getValue, thanks MedicOP for finding this issue
|
cm.sendOk("You have banned " + banned.getValue() + " from the expedition."); // getValue, thanks MedicOP (MicroWilly69) for finding this issue
|
||||||
cm.dispose();
|
cm.dispose();
|
||||||
} else {
|
} else {
|
||||||
cm.sendSimple(list);
|
cm.sendSimple(list);
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
Refining NPC:
|
Refining NPC:
|
||||||
* Chaos scroll SYNTHETIZER (rofl)
|
* Chaos scroll SYNTHETIZER (rofl)
|
||||||
*
|
*
|
||||||
* @author RonanLana
|
* @author RonanLana (ronancpl)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var status = 0;
|
var status = 0;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
/* Jack - Refining NPC
|
/* Jack - Refining NPC
|
||||||
@author RonanLana
|
@author ronancpl (Ronan)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var status = 0;
|
var status = 0;
|
||||||
|
|||||||
@@ -3566,7 +3566,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
|
|||||||
p = new Pair<>(mbs, 0);
|
p = new Pair<>(mbs, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isSingletonStatup(mbs)) { // thanks resinate, Egg Daddy for pointing out morph issues when updating it along with other statups
|
if (!isSingletonStatup(mbs)) { // thanks resinate, Daddy Egg for pointing out morph issues when updating it along with other statups
|
||||||
ret.add(p);
|
ret.add(p);
|
||||||
} else {
|
} else {
|
||||||
singletonStatups.add(p);
|
singletonStatups.add(p);
|
||||||
@@ -7385,7 +7385,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
|
|||||||
rs = ps.executeQuery();
|
rs = ps.executeQuery();
|
||||||
while (rs.next()) {
|
while (rs.next()) {
|
||||||
Skill pSkill = SkillFactory.getSkill(rs.getInt("skillid"));
|
Skill pSkill = SkillFactory.getSkill(rs.getInt("skillid"));
|
||||||
if(pSkill != null) // edit reported by shavit, thanks Zein for noticing an NPE here
|
if(pSkill != null) // edit reported by Shavit (=^● ⋏ ●^=), thanks Zein for noticing an NPE here
|
||||||
{
|
{
|
||||||
ret.skills.put(pSkill, new SkillEntry(rs.getByte("skilllevel"), rs.getInt("masterlevel"), rs.getLong("expiration")));
|
ret.skills.put(pSkill, new SkillEntry(rs.getByte("skilllevel"), rs.getInt("masterlevel"), rs.getLong("expiration")));
|
||||||
}
|
}
|
||||||
@@ -7972,7 +7972,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
|
|||||||
client.announce(MaplePacketCreator.updatePlayerStats(hpmpupdate, true, this));
|
client.announce(MaplePacketCreator.updatePlayerStats(hpmpupdate, true, this));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (oldmaxhp != localmaxhp) { // thanks Wh1SK3Y for pointing out a deadlock occuring related to party members HP
|
if (oldmaxhp != localmaxhp) { // thanks Wh1SK3Y (Suwaidy) for pointing out a deadlock occuring related to party members HP
|
||||||
updatePartyMemberHP();
|
updatePartyMemberHP();
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
package client;
|
package client;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author PurpleMadness (Patrick) :O
|
* @author PurpleMadness < Patrick :O >
|
||||||
*/
|
*/
|
||||||
public class MapleMount {
|
public class MapleMount {
|
||||||
private int itemid;
|
private int itemid;
|
||||||
|
|||||||
@@ -561,7 +561,7 @@ public class GameConstants {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isFreeMarketRoom(int mapid) {
|
public static boolean isFreeMarketRoom(int mapid) {
|
||||||
return mapid / 1000000 == 910 && mapid > 910000000; // FM rooms subset, thanks to shavit
|
return mapid / 1000000 == 910 && mapid > 910000000; // FM rooms subset, thanks to shavitush (shavit)
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isMerchantLocked(MapleMap map) {
|
public static boolean isMerchantLocked(MapleMap map) {
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ public final class FaceExpressionHandler extends AbstractMaplePacketHandler {
|
|||||||
int emote = slea.readInt();
|
int emote = slea.readInt();
|
||||||
|
|
||||||
if (emote > 7) {
|
if (emote > 7) {
|
||||||
int itemid = 5159992 + emote; // thanks Rajan (Darter) for reporting unchecked emote itemid
|
int itemid = 5159992 + emote; // thanks RajanGrewal (Darter) for reporting unchecked emote itemid
|
||||||
if (!ItemConstants.isFaceExpression(itemid) || chr.getInventory(ItemConstants.getInventoryType(itemid)).findById(itemid) == null) {
|
if (!ItemConstants.isFaceExpression(itemid) || chr.getInventory(ItemConstants.getInventoryType(itemid)).findById(itemid) == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public final class MobDamageMobFriendlyHandler extends AbstractMaplePacketHandle
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
int damage = Randomizer.nextInt(((monster.getMaxHp() / 13 + monster.getPADamage() * 10)) * 2 + 500) / 10; //Beng's formula.
|
int damage = Randomizer.nextInt(((monster.getMaxHp() / 13 + monster.getPADamage() * 10)) * 2 + 500) / 10; // Formula planned by Beng.
|
||||||
|
|
||||||
if (monster.getHp() - damage < 1) { // friendly dies
|
if (monster.getHp() - damage < 1) { // friendly dies
|
||||||
if(monster.getId() == 9300102) {
|
if(monster.getId() == 9300102) {
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ public final class PlayerMapTransitionHandler extends AbstractMaplePacketHandler
|
|||||||
chr.announce(MaplePacketCreator.giveBuff(1, beaconid, stat));
|
chr.announce(MaplePacketCreator.giveBuff(1, beaconid, stat));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!chr.isHidden()) { // thanks Lame for noticing hidden characters controlling mobs
|
if (!chr.isHidden()) { // thanks Lame (Conrad) for noticing hidden characters controlling mobs
|
||||||
for (MapleMapObject mo : chr.getMap().getMonsters()) { // thanks BHB, IxianMace, Jefe for noticing several issues regarding mob statuses (such as freeze)
|
for (MapleMapObject mo : chr.getMap().getMonsters()) { // thanks BHB, IxianMace, Jefe for noticing several issues regarding mob statuses (such as freeze)
|
||||||
MapleMonster m = (MapleMonster) mo;
|
MapleMonster m = (MapleMonster) mo;
|
||||||
if (m.getSpawnEffect() == 0 || m.getHp() < m.getMaxHp()) { // avoid effect-spawning mobs
|
if (m.getSpawnEffect() == 0 || m.getHp() < m.getMaxHp()) { // avoid effect-spawning mobs
|
||||||
|
|||||||
@@ -466,7 +466,7 @@ public final class RingActionHandler extends AbstractMaplePacketHandler {
|
|||||||
|
|
||||||
case 9:
|
case 9:
|
||||||
try {
|
try {
|
||||||
// By -- Drago (Dragohe4rt)
|
// By -- Dragoso (Drago)
|
||||||
// Groom and Bride's Wishlist
|
// Groom and Bride's Wishlist
|
||||||
|
|
||||||
MapleCharacter player = c.getPlayer();
|
MapleCharacter player = c.getPlayer();
|
||||||
|
|||||||
@@ -340,7 +340,7 @@ public class MaplePacketCreator {
|
|||||||
if (!viewall) {
|
if (!viewall) {
|
||||||
mplew.write(0);
|
mplew.write(0);
|
||||||
}
|
}
|
||||||
if (chr.isGM() || chr.isGmJob()) { // thanks Egg Daddy (Ubaware), resinate for noticing GM jobs crashing on non-GM players account
|
if (chr.isGM() || chr.isGmJob()) { // thanks Daddy Egg (Ubaware), resinate for noticing GM jobs crashing on non-GM players account
|
||||||
mplew.write(0);
|
mplew.write(0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user