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

Rename and clean up MapleCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:09:45 +02:00
parent 46bd0570d7
commit 7dc3a2159a
379 changed files with 3418 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/npc/changeName.js
View File

@@ -47,8 +47,8 @@ function action(mode, type, selection) {
} else if(status == 2) {
var text = cm.getText();
const MapleCharacter = Java.type('client.MapleCharacter');
var canCreate = MapleCharacter.canCreateChar(text);
const Character = Java.type('client.Character');
var canCreate = Character.canCreateChar(text);
if(canCreate) {
cm.getPlayer().setName(text);
cm.sendOk("Your name has been changed to #b" + text + "#k. You will have to login again for this to take effect.", 1);

2
src/main/java/client/BuddyList.java
View File

@@ -129,7 +129,7 @@ public class BuddyList {
public void broadcast(Packet packet, PlayerStorage pstorage) {
for(int bid : getBuddyIds()) {
MapleCharacter chr = pstorage.getCharacterById(bid);
Character chr = pstorage.getCharacterById(bid);
if(chr != null && chr.isLoggedinWorld()) {
chr.sendPacket(packet);

391
src/main/java/client/MapleCharacter.java → src/main/java/client/Character.java
View File

@@ -93,7 +93,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.regex.Pattern;
public class MapleCharacter extends AbstractMapleCharacterObject {
public class Character extends AbstractMapleCharacterObject {
private static final MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
private static final String LEVEL_200 = "[Congrats] %s has reached Level %d! Congratulate %s on such an amazing achievement!";
private static final String[] BLOCKED_NAMES = {"admin", "owner", "moderator", "intern", "donor", "administrator", "FREDRICK", "help", "helper", "alert", "notice", "maplestory", "fuck", "wizet", "fucking", "negro", "fuk", "fuc", "penis", "pussy", "asshole", "gay",
@@ -142,12 +142,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
private String commandtext;
private String dataString;
private String search = null;
private AtomicBoolean mapTransitioning = new AtomicBoolean(true); // player client is currently trying to change maps or log in the game map
private AtomicBoolean awayFromWorld = new AtomicBoolean(true); // player is online, but on cash shop or mts
private AtomicInteger exp = new AtomicInteger();
private AtomicInteger gachaexp = new AtomicInteger();
private AtomicInteger meso = new AtomicInteger();
private AtomicInteger chair = new AtomicInteger(-1);
private final AtomicBoolean mapTransitioning = new AtomicBoolean(true); // player client is currently trying to change maps or log in the game map
private final AtomicBoolean awayFromWorld = new AtomicBoolean(true); // player is online, but on cash shop or mts
private final AtomicInteger exp = new AtomicInteger();
private final AtomicInteger gachaexp = new AtomicInteger();
private final AtomicInteger meso = new AtomicInteger();
private final AtomicInteger chair = new AtomicInteger(-1);
private int merchantmeso;
private BuddyList buddylist;
private EventInstanceManager eventInstance = null;
@@ -162,7 +162,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
private MapleRockPaperScissor rps;
private MapleMount maplemount;
private MapleParty party;
private Pet[] pets = new Pet[3];
private final Pet[] pets = new Pet[3];
private MaplePlayerShop playerShop = null;
private MapleShop shop = null;
private MapleSkinColor skinColor = MapleSkinColor.NORMAL;
@@ -170,28 +170,28 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
private MapleTrade trade = null;
private MonsterBook monsterbook;
private CashShop cashshop;
private Set<NewYearCardRecord> newyears = new LinkedHashSet<>();
private SavedLocation savedLocations[];
private SkillMacro[] skillMacros = new SkillMacro[5];
private final Set<NewYearCardRecord> newyears = new LinkedHashSet<>();
private final SavedLocation[] savedLocations;
private final SkillMacro[] skillMacros = new SkillMacro[5];
private List<Integer> lastmonthfameids;
private List<WeakReference<MapleMap>> lastVisitedMaps = new LinkedList<>();
private final List<WeakReference<MapleMap>> lastVisitedMaps = new LinkedList<>();
private WeakReference<MapleMap> ownedMap = new WeakReference<>(null);
private final Map<Short, MapleQuestStatus> quests;
private Set<MapleMonster> controlled = new LinkedHashSet<>();
private Map<Integer, String> entered = new LinkedHashMap<>();
private Set<MapleMapObject> visibleMapObjects = Collections.newSetFromMap(new ConcurrentHashMap<>());
private Map<Skill, SkillEntry> skills = new LinkedHashMap<>();
private Map<Integer, Integer> activeCoupons = new LinkedHashMap<>();
private Map<Integer, Integer> activeCouponRates = new LinkedHashMap<>();
private EnumMap<BuffStat, MapleBuffStatValueHolder> effects = new EnumMap<>(BuffStat.class);
private Map<BuffStat, Byte> buffEffectsCount = new LinkedHashMap<>();
private Map<MapleDisease, Long> diseaseExpires = new LinkedHashMap<>();
private Map<Integer, Map<BuffStat, MapleBuffStatValueHolder>> buffEffects = new LinkedHashMap<>(); // non-overriding buffs thanks to Ronan
private Map<Integer, Long> buffExpires = new LinkedHashMap<>();
private Map<Integer, KeyBinding> keymap = new LinkedHashMap<>();
private Map<Integer, MapleSummon> summons = new LinkedHashMap<>();
private Map<Integer, MapleCoolDownValueHolder> coolDowns = new LinkedHashMap<>();
private EnumMap<MapleDisease, Pair<MapleDiseaseValueHolder, MobSkill>> diseases = new EnumMap<>(MapleDisease.class);
private final Set<MapleMonster> controlled = new LinkedHashSet<>();
private final Map<Integer, String> entered = new LinkedHashMap<>();
private final Set<MapleMapObject> visibleMapObjects = Collections.newSetFromMap(new ConcurrentHashMap<>());
private final Map<Skill, SkillEntry> skills = new LinkedHashMap<>();
private final Map<Integer, Integer> activeCoupons = new LinkedHashMap<>();
private final Map<Integer, Integer> activeCouponRates = new LinkedHashMap<>();
private final EnumMap<BuffStat, MapleBuffStatValueHolder> effects = new EnumMap<>(BuffStat.class);
private final Map<BuffStat, Byte> buffEffectsCount = new LinkedHashMap<>();
private final Map<MapleDisease, Long> diseaseExpires = new LinkedHashMap<>();
private final Map<Integer, Map<BuffStat, MapleBuffStatValueHolder>> buffEffects = new LinkedHashMap<>(); // non-overriding buffs thanks to Ronan
private final Map<Integer, Long> buffExpires = new LinkedHashMap<>();
private final Map<Integer, KeyBinding> keymap = new LinkedHashMap<>();
private final Map<Integer, MapleSummon> summons = new LinkedHashMap<>();
private final Map<Integer, MapleCoolDownValueHolder> coolDowns = new LinkedHashMap<>();
private final EnumMap<MapleDisease, Pair<MapleDiseaseValueHolder, MobSkill>> diseases = new EnumMap<>(MapleDisease.class);
private byte[] m_aQuickslotLoaded;
private QuickslotBinding m_pQuickslotKeyMapped;
private MapleDoor pdoor = null;
@@ -209,36 +209,36 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
private ScheduledFuture<?> chairRecoveryTask = null;
private ScheduledFuture<?> pendantOfSpirit = null; //1122017
private ScheduledFuture<?> cpqSchedule = null;
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);
private Lock prtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PRT);
private Lock cpnLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CPN);
private Map<Integer, Set<Integer>> excluded = new LinkedHashMap<>();
private Set<Integer> excludedItems = new LinkedHashSet<>();
private Set<Integer> disabledPartySearchInvites = new LinkedHashSet<>();
private static String[] ariantroomleader = new String[3];
private static int[] ariantroomslot = new int[3];
private final Lock chrLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CHR, true);
private final Lock evtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_EVT, true);
private final Lock petLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PET, true);
private final Lock prtLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_PRT);
private final Lock cpnLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_CPN);
private final Map<Integer, Set<Integer>> excluded = new LinkedHashMap<>();
private final Set<Integer> excludedItems = new LinkedHashSet<>();
private final Set<Integer> disabledPartySearchInvites = new LinkedHashSet<>();
private static final String[] ariantroomleader = new String[3];
private static final int[] ariantroomslot = new int[3];
private long portaldelay = 0, lastcombo = 0;
private short combocounter = 0;
private List<String> blockedPortals = new ArrayList<>();
private Map<Short, String> area_info = new LinkedHashMap<>();
private final List<String> blockedPortals = new ArrayList<>();
private final Map<Short, String> area_info = new LinkedHashMap<>();
private AutobanManager autoban;
private boolean isbanned = false;
private boolean blockCashShop = false;
private boolean allowExpGain = true;
private byte pendantExp = 0, lastmobcount = 0, doorSlot = -1;
private List<Integer> trockmaps = new ArrayList<>();
private List<Integer> viptrockmaps = new ArrayList<>();
private final List<Integer> trockmaps = new ArrayList<>();
private final List<Integer> viptrockmaps = new ArrayList<>();
private Map<String, MapleEvents> events = new LinkedHashMap<>();
private PartyQuest partyQuest = null;
private List<Pair<DelayedQuestUpdate, Object[]>> npcUpdateQuests = new LinkedList<>();
private final List<Pair<DelayedQuestUpdate, Object[]>> npcUpdateQuests = new LinkedList<>();
private MapleDragon dragon = null;
private MapleRing marriageRing;
private int marriageItemid = -1;
private int partnerId = -1;
private List<MapleRing> crushRings = new ArrayList<>();
private List<MapleRing> friendshipRings = new ArrayList<>();
private final List<MapleRing> crushRings = new ArrayList<>();
private final List<MapleRing> friendshipRings = new ArrayList<>();
private boolean loggedIn = false;
private boolean useCS; //chaos scroll upon crafting item.
private long npcCd;
@@ -259,7 +259,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
private long loginTime;
private boolean chasing = false;
private MapleCharacter() {
private Character() {
super.setListener(new AbstractCharacterListener() {
@Override
public void onHpChanged(int oldHp) {
@@ -296,7 +296,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
statup.add(new Pair<>(s.getKey(), s.getValue()));
}
sendPacket(PacketCreator.updatePlayerStats(statup, true, MapleCharacter.this));
sendPacket(PacketCreator.updatePlayerStats(statup, true, Character.this));
}
});
@@ -311,7 +311,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (type == InventoryType.CASH) {
b = 96;
}
inventory[type.ordinal()] = new Inventory(this, type, (byte) b);
inventory[type.ordinal()] = new Inventory(this, type, b);
}
inventory[InventoryType.CANHOLD.ordinal()] = new InventoryProof(this);
@@ -356,8 +356,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return getJobStyle((byte) ((this.getStr() > this.getDex()) ? 0x80 : 0x40));
}
public static MapleCharacter getDefault(MapleClient c) {
MapleCharacter ret = new MapleCharacter();
public static Character getDefault(MapleClient c) {
Character ret = new Character();
ret.client = c;
ret.setGMLevel(0);
ret.hp = 50;
@@ -579,9 +579,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
String prop = eim.getProperty("groomId");
if (prop != null) {
if((Integer.parseInt(prop) == id || eim.getIntProperty("brideId") == id) && (mapid == 680000110 || mapid == 680000210)) {
return true;
}
return (Integer.parseInt(prop) == id || eim.getIntProperty("brideId") == id) && (mapid == 680000110 || mapid == 680000210);
}
}
@@ -924,7 +922,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
hasSandboxItem = false;
}
public FameStatus canGiveFame(MapleCharacter from) {
public FameStatus canGiveFame(Character from) {
if (this.isGM()) {
return FameStatus.OK;
} else if (lastfametime >= System.currentTimeMillis() - 3600000 * 24) {
@@ -1020,7 +1018,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
private void broadcastChangeJob() {
for (MapleCharacter chr : map.getAllPlayers()) {
for (Character chr : map.getAllPlayers()) {
MapleClient chrC = chr.getClient();
if (chrC != null) { // propagate new job 3rd-person effects (FJ, Aran 1st strike, etc)
@@ -1032,7 +1030,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
TimerManager.getInstance().schedule(new Runnable() { // need to delay to ensure clientside has finished reloading character data
@Override
public void run() {
MapleCharacter thisChr = MapleCharacter.this;
Character thisChr = Character.this;
MapleMap map = thisChr.getMap();
if (map != null) {
@@ -1443,11 +1441,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (value == 1 && ((returnMapid == 211000000 && thisMapid != 200082300) || returnMapid == 193000000)) {
return true; //protection from cold
} else if(value == 2 && (returnMapid == 230000000 || thisMapid == 200082300)) {
return true; //breathing underwater
} else {
return false;
}
} else return value == 2 && (returnMapid == 230000000 || thisMapid == 200082300); //breathing underwater
}
}
} finally {
@@ -1483,7 +1477,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return lastVisited;
}
public void partyOperationUpdate(MapleParty party, List<MapleCharacter> exPartyMembers) {
public void partyOperationUpdate(MapleParty party, List<Character> exPartyMembers) {
List<WeakReference<MapleMap>> mapids;
petLock.lock();
@@ -1493,14 +1487,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
petLock.unlock();
}
List<MapleCharacter> partyMembers = new LinkedList<>();
for(MapleCharacter mc : (exPartyMembers != null) ? exPartyMembers : this.getPartyMembersOnline()) {
List<Character> partyMembers = new LinkedList<>();
for (Character mc : (exPartyMembers != null) ? exPartyMembers : this.getPartyMembersOnline()) {
if (mc.isLoggedinWorld()) {
partyMembers.add(mc);
}
}
MapleCharacter partyLeaver = null;
Character partyLeaver = null;
if (exPartyMembers != null) {
partyMembers.remove(this);
partyLeaver = this;
@@ -1528,18 +1522,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
updatePartyTownDoors(party, this, partyLeaver, partyMembers);
}
private static void addPartyPlayerDoor(MapleCharacter target) {
private static void addPartyPlayerDoor(Character target) {
MapleDoor targetDoor = target.getPlayerDoor();
if (targetDoor != null) {
target.applyPartyDoor(targetDoor, true);
}
}
private static void removePartyPlayerDoor(MapleParty party, MapleCharacter target) {
private static void removePartyPlayerDoor(MapleParty party, Character target) {
target.removePartyDoor(party);
}
private static void updatePartyTownDoors(MapleParty party, MapleCharacter target, MapleCharacter partyLeaver, List<MapleCharacter> partyMembers) {
private static void updatePartyTownDoors(MapleParty party, Character target, Character partyLeaver, List<Character> partyMembers) {
if (partyLeaver != null) {
removePartyPlayerDoor(party, target);
} else {
@@ -1550,7 +1544,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (!partyMembers.isEmpty()) {
partyDoors = party.getDoors();
for(MapleCharacter pchr : partyMembers) {
for (Character pchr : partyMembers) {
MapleDoor door = partyDoors.get(pchr.getId());
if (door != null) {
door.updateDoorPortal(pchr);
@@ -1558,7 +1552,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
for (MapleDoor door : partyDoors.values()) {
for(MapleCharacter pchar : partyMembers) {
for (Character pchar : partyMembers) {
MapleDoorObject mdo = door.getTownDoor();
mdo.sendDestroyData(pchar.getClient(), true);
pchar.removeVisibleMapObject(mdo);
@@ -1568,7 +1562,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (partyLeaver != null) {
Collection<MapleDoor> leaverDoors = partyLeaver.getDoors();
for (MapleDoor door : leaverDoors) {
for(MapleCharacter pchar : partyMembers) {
for (Character pchar : partyMembers) {
MapleDoorObject mdo = door.getTownDoor();
mdo.sendDestroyData(pchar.getClient(), true);
pchar.removeVisibleMapObject(mdo);
@@ -1581,7 +1575,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
MapleDoor door = partyDoors.get(chrid);
if (door != null) {
for(MapleCharacter pchar : partyMembers) {
for (Character pchar : partyMembers) {
MapleDoorObject mdo = door.getTownDoor();
mdo.sendSpawnData(pchar.getClient());
pchar.addVisibleMapObject(mdo);
@@ -1662,7 +1656,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public void notifyMapTransferToPartner(int mapid) {
if (partnerId > 0) {
final MapleCharacter partner = getWorldServer().getPlayerStorage().getCharacterById(partnerId);
final Character partner = getWorldServer().getPlayerStorage().getCharacterById(partnerId);
if (partner != null && !partner.isAwayFromWorld()) {
partner.sendPacket(WeddingPackets.OnNotifyWeddingPartnerTransfer(id, mapid));
}
@@ -1709,8 +1703,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
} finally {
prtLock.unlock();
}
if (MapleCharacter.this.getParty() != null) {
MapleCharacter.this.getParty().setEnemy(k);
if (Character.this.getParty() != null) {
Character.this.getParty().setEnemy(k);
}
silentPartyUpdateInternal(getParty()); // EIM script calls inside
@@ -1788,7 +1782,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (berserkSchedule != null) {
berserkSchedule.cancel(false);
}
final MapleCharacter chr = this;
final Character chr = this;
if (job.equals(MapleJob.DARKKNIGHT)) {
Skill BerserkX = SkillFactory.getSkill(DarkKnight.BERSERK);
final int skilllevel = getSkillLevel(BerserkX);
@@ -1803,9 +1797,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
sendPacket(PacketCreator.showOwnBerserk(skilllevel, berserk));
if (!isHidden) {
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false);
getMap().broadcastMessage(Character.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false);
} else {
getMap().broadcastGMMessage(MapleCharacter.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false);
getMap().broadcastGMMessage(Character.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false);
}
}
}, 5000, 3000);
@@ -1879,13 +1873,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (itemid / 1000000 == 2) {
if (ii.isConsumeOnPickup(itemid)) {
if (ItemConstants.isPartyItem(itemid)) {
List<MapleCharacter> pchr = this.getPartyMembersOnSameMap();
List<Character> pchr = this.getPartyMembersOnSameMap();
if (!ItemConstants.isPartyAllcure(itemid)) {
MapleStatEffect mse = ii.getItemEffect(itemid);
if (!pchr.isEmpty()) {
for (MapleCharacter mc : pchr) {
for (Character mc : pchr) {
mse.applyTo(mc);
}
} else {
@@ -1893,7 +1887,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
} else {
if (!pchr.isEmpty()) {
for (MapleCharacter mc : pchr) {
for (Character mc : pchr) {
mc.dispelDebuffs();
}
} else {
@@ -1929,7 +1923,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return;
}
List<MapleCharacter> mpcs = new LinkedList<>();
List<Character> mpcs = new LinkedList<>();
if (mapitem.getMeso() > 0 && !mapitem.isPickedUp()) {
mpcs = getPartyMembersOnSameMap();
}
@@ -1956,7 +1950,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (mapitem.getMeso() > 0) {
if (!mpcs.isEmpty()) {
int mesosamm = mapitem.getMeso() / mpcs.size();
for (MapleCharacter partymem : mpcs) {
for (Character partymem : mpcs) {
if (partymem.isLoggedinWorld()) {
partymem.gainMeso(mesosamm, true, true, false);
}
@@ -1998,7 +1992,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (mapitem.getMeso() > 0) {
if (!mpcs.isEmpty()) {
int mesosamm = mapitem.getMeso() / mpcs.size();
for (MapleCharacter partymem : mpcs) {
for (Character partymem : mpcs) {
if (partymem.isLoggedinWorld()) {
partymem.gainMeso(mesosamm, true, true, false);
}
@@ -2086,7 +2080,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
Skill battleship = SkillFactory.getSkill(Corsair.BATTLE_SHIP);
int cooldown = battleship.getEffect(getSkillLevel(battleship)).getCooldown();
sendPacket(PacketCreator.skillCooldown(Corsair.BATTLE_SHIP, cooldown));
addCooldown(Corsair.BATTLE_SHIP, Server.getInstance().getCurrentTime(), (long)(cooldown * 1000));
addCooldown(Corsair.BATTLE_SHIP, Server.getInstance().getCurrentTime(), cooldown * 1000);
removeCooldown(5221999);
cancelEffectFromBuffStat(BuffStat.MONSTER_RIDING);
} else {
@@ -2122,7 +2116,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
private void notifyRemoteChannel(MapleClient c, int remoteChannel, int otherCid, BuddyList.BuddyOperation operation) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (remoteChannel != -1) {
c.getWorldServer().buddyChanged(otherCid, player.getId(), player.getName(), c.getChannel(), operation);
}
@@ -2139,7 +2133,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
nextPendingRequest(client);
}
public static boolean deleteCharFromDB(MapleCharacter player, int senderAccId) {
public static boolean deleteCharFromDB(Character player, int senderAccId) {
int cid = player.getId();
if (!Server.getInstance().haveCharacterEntry(senderAccId, cid)) { // thanks zera (EpiphanyMS) for pointing a critical exploit with non-authed character deletion request
return false;
@@ -2164,7 +2158,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) {
int buddyid = rs.getInt("buddyid");
MapleCharacter buddy = Server.getInstance().getWorld(world).getPlayerStorage().getCharacterById(buddyid);
Character buddy = Server.getInstance().getWorld(world).getPlayerStorage().getCharacterById(buddyid);
if (buddy != null) {
buddy.deleteBuddy(cid);
@@ -2317,7 +2311,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
String[] toDel = {"famelog", "inventoryitems", "keymap", "queststatus", "savedlocations", "trocklocations", "skillmacros", "skills", "eventstats", "server_queue"};
for (String s : toDel) {
MapleCharacter.deleteWhereCharacterId(con, "DELETE FROM `" + s + "` WHERE characterid = ?", cid);
Character.deleteWhereCharacterId(con, "DELETE FROM `" + s + "` WHERE characterid = ?", cid);
}
Server.getInstance().deleteCharacterEntry(accId, cid);
@@ -2457,12 +2451,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
final int healHP = localchairhp;
final int healMP = localchairmp;
if(MapleCharacter.this.getHp() < localmaxhp) {
if (Character.this.getHp() < localmaxhp) {
byte recHP = (byte) (healHP / YamlConfig.config.server.CHAIR_EXTRA_HEAL_MULTIPLIER);
sendPacket(PacketCreator.showOwnRecovery(recHP));
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, recHP), false);
} else if (MapleCharacter.this.getMp() >= localmaxmp) {
getMap().broadcastMessage(Character.this, PacketCreator.showRecovery(id, recHP), false);
} else if (Character.this.getMp() >= localmaxmp) {
stopChairTask(); // optimizing schedule management when player is already with full pool.
}
@@ -2506,10 +2500,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return;
}
if(MapleCharacter.this.getHp() < localmaxhp) {
if (Character.this.getHp() < localmaxhp) {
if (healHP > 0) {
sendPacket(PacketCreator.showOwnRecovery(healHP));
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, healHP), false);
getMap().broadcastMessage(Character.this, PacketCreator.showRecovery(id, healHP), false);
}
}
@@ -2624,7 +2618,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void collectDiseases() {
for (MapleCharacter chr : map.getAllPlayers()) {
for (Character chr : map.getAllPlayers()) {
int cid = chr.getId();
for (Entry<MapleDisease, Pair<Long, MobSkill>> di : chr.getAllDiseases().entrySet()) {
@@ -3073,7 +3067,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
int equip = (int) Math.min((long) (gain / 10) * pendantExp, Integer.MAX_VALUE);
gainExpInternal((long) gain, equip, party, show, inChat, white);
gainExpInternal(gain, equip, party, show, inChat, white);
}
public void loseExp(int loss, boolean show, boolean inChat) {
@@ -3152,7 +3146,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
gainFame(delta, null, 0);
}
public boolean gainFame(int delta, MapleCharacter fromPlayer, int mode) {
public boolean gainFame(int delta, Character fromPlayer, int mode) {
Pair<Integer, Integer> fameRes = applyFame(delta);
delta = fameRes.getRight();
if (delta != 0) {
@@ -3801,7 +3795,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
private boolean isUpdatingEffect(Set<MapleStatEffect> activeEffects, MapleStatEffect mse) {
if (mse == null) return false;
if (mse == null) {
return false;
}
// thanks xinyifly for noticing "Speed Infusion" crashing game when updating buffs during map transition
boolean active = mse.isActive(this);
@@ -4122,7 +4118,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
List<MapleStatEffect> buffList = new LinkedList<>();
while (true) {
Map<MapleStatEffect, Integer> leafStatCount = topologicalSortLeafStatCount(buffStack);
if (leafStatCount.isEmpty()) break;
if (leafStatCount.isEmpty()) {
break;
}
List<MapleStatEffect> clearedNodes = topologicalSortRemoveLeafStats(stackedBuffStats, buffStack, leafStatCount);
if (clearedNodes.isEmpty()) {
@@ -4156,8 +4154,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
Comparator cmp = new Comparator<Pair<MapleStatEffect, Integer>>() {
@Override
public int compare(Pair<MapleStatEffect, Integer> o1, Pair<MapleStatEffect, Integer> o2)
{
public int compare(Pair<MapleStatEffect, Integer> o1, Pair<MapleStatEffect, Integer> o2) {
return o2.getRight().compareTo(o1.getRight());
}
};
@@ -4220,7 +4217,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
retrievedEffects.put(mbsvh.effect.getBuffSourceId(), new Pair<>(mbsvh.effect, mbsvh.startTime));
}
maxBuffValue.put(mbs, new Pair<>(Integer.MIN_VALUE, (MapleStatEffect) null));
maxBuffValue.put(mbs, new Pair<>(Integer.MIN_VALUE, null));
}
Map<MapleStatEffect, Integer> updateEffects = new LinkedHashMap<>();
@@ -4405,8 +4402,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
addHP(healEffect.getHp());
sendPacket(PacketCreator.showOwnBuffEffect(beholder, 2));
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.summonSkill(getId(), beholder, 5), true);
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showOwnBuffEffect(beholder, 2), false);
getMap().broadcastMessage(Character.this, PacketCreator.summonSkill(getId(), beholder, 5), true);
getMap().broadcastMessage(Character.this, PacketCreator.showOwnBuffEffect(beholder, 2), false);
}
}, healInterval, healInterval);
}
@@ -4421,10 +4418,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return;
}
buffEffect.applyTo(MapleCharacter.this);
buffEffect.applyTo(Character.this);
sendPacket(PacketCreator.showOwnBuffEffect(beholder, 2));
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.summonSkill(getId(), beholder, (int) (Math.random() * 3) + 6), true);
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBuffEffect(getId(), beholder, 2), false);
getMap().broadcastMessage(Character.this, PacketCreator.summonSkill(getId(), beholder, (int) (Math.random() * 3) + 6), true);
getMap().broadcastMessage(Character.this, PacketCreator.showBuffEffect(getId(), beholder, 2), false);
}
}, buffInterval, buffInterval);
}
@@ -4457,7 +4454,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
addHP(heal);
sendPacket(PacketCreator.showOwnRecovery(heal));
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, heal), false);
getMap().broadcastMessage(Character.this, PacketCreator.showRecovery(id, heal), false);
}
}, healInterval, healInterval);
} finally {
@@ -4959,8 +4956,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public MapleFamily getFamily() {
if(familyEntry != null) return familyEntry.getFamily();
else return null;
if (familyEntry != null) {
return familyEntry.getFamily();
} else {
return null;
}
}
public MapleFamilyEntry getFamilyEntry() {
@@ -4968,7 +4968,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void setFamilyEntry(MapleFamilyEntry entry) {
if(entry != null) setFamilyId(entry.getFamily().getID());
if (entry != null) {
setFamilyId(entry.getFamily().getID());
}
this.familyEntry = entry;
}
@@ -5114,7 +5116,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public boolean haveWeddingRing() {
int rings[] = {1112806, 1112803, 1112807, 1112809};
int[] rings = {1112806, 1112803, 1112807, 1112809};
for (int ringid : rings) {
if (haveItemWithId(ringid, true)) {
@@ -5274,7 +5276,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
elapsedDays = 100;
}
long netMeso = (long) merchantmeso; // negative mesos issues found thanks to Flash, Vcoc
long netMeso = merchantmeso; // negative mesos issues found thanks to Flash, Vcoc
netMeso = (netMeso * (100 - elapsedDays)) / 100;
return (int) netMeso;
}
@@ -5429,14 +5431,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}
public List<MapleCharacter> getPartyMembersOnline() {
List<MapleCharacter> list = new LinkedList<>();
public List<Character> getPartyMembersOnline() {
List<Character> list = new LinkedList<>();
prtLock.lock();
try {
if (party != null) {
for (MaplePartyCharacter mpc : party.getMembers()) {
MapleCharacter mc = mpc.getPlayer();
Character mc = mpc.getPlayer();
if (mc != null) {
list.add(mc);
}
@@ -5449,15 +5451,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return list;
}
public List<MapleCharacter> getPartyMembersOnSameMap() {
List<MapleCharacter> list = new LinkedList<>();
public List<Character> getPartyMembersOnSameMap() {
List<Character> list = new LinkedList<>();
int thisMapHash = this.getMap().hashCode();
prtLock.lock();
try {
if (party != null) {
for (MaplePartyCharacter mpc : party.getMembers()) {
MapleCharacter chr = mpc.getPlayer();
Character chr = mpc.getPlayer();
if (chr != null) {
MapleMap chrMap = chr.getMap();
if (chrMap != null && chrMap.hashCode() == thisMapHash && chr.isLoggedinWorld()) {
@@ -5473,7 +5475,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return list;
}
public boolean isPartyMember(MapleCharacter chr) {
public boolean isPartyMember(Character chr) {
return isPartyMember(chr.getId());
}
@@ -5704,7 +5706,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public final void setQuestAdd(final MapleQuest quest, final byte status, final String customData) {
synchronized (quests) {
if (!quests.containsKey(quest.getId())) {
final MapleQuestStatus stat = new MapleQuestStatus(quest, MapleQuestStatus.Status.getById((int)status));
final MapleQuestStatus stat = new MapleQuestStatus(quest, MapleQuestStatus.Status.getById(status));
stat.setCustomData(customData);
quests.put(quest.getId(), stat);
}
@@ -5963,7 +5965,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
if (energybar >= 10000 && energybar < 11000) {
energybar = 15000;
final MapleCharacter chr = this;
final Character chr = this;
tMan.schedule(new Runnable() {
@Override
public void run() {
@@ -6000,7 +6002,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return script.equals(e);
}
public void hasGivenFame(MapleCharacter to) {
public void hasGivenFame(Character to) {
lastfametime = System.currentTimeMillis();
lastmonthfameids.add(Integer.valueOf(to.getId()));
try (Connection con = DatabaseConnection.getConnection();
@@ -6408,7 +6410,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
ThreadManager.getInstance().newTask(new Runnable() {
@Override
public void run() {
MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(job), MapleCharacter.this);
MaplePlayerNPC.spawnPlayerNPC(GameConstants.getHallOfFameMapid(job), Character.this);
}
});
}
@@ -6498,8 +6500,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
familyEntry.giveReputationToSenior(YamlConfig.config.server.FAMILY_REP_PER_LEVELUP, true);
MapleFamilyEntry senior = familyEntry.getSenior();
if (senior != null) { //only send the message to direct senior
MapleCharacter seniorChr = senior.getChr();
if(seniorChr != null) seniorChr.sendPacket(PacketCreator.levelUpMessage(1, level, getName()));
Character seniorChr = senior.getChr();
if (seniorChr != null) {
seniorChr.sendPacket(PacketCreator.levelUpMessage(1, level, getName()));
}
}
}
}
@@ -6517,7 +6521,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
if (party != null) {
if(partyLeader) party.assignNewLeader(client);
if (partyLeader) {
party.assignNewLeader(client);
}
MapleParty.leaveParty(party, client);
return true;
@@ -6668,7 +6674,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public void updateCouponRates() {
Inventory cashInv = this.getInventory(InventoryType.CASH);
if (cashInv == null) return;
if (cashInv == null) {
return;
}
effLock.lock();
chrLock.lock();
@@ -6745,8 +6753,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
maxExpCouponId = couponId;
maxExpRate = getCouponMultiplier(couponId);
}
}
else {
} else {
if (maxDropRate < getCouponMultiplier(couponId)) {
maxDropCouponId = couponId;
maxDropRate = getCouponMultiplier(couponId);
@@ -6833,8 +6840,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}
public static MapleCharacter loadCharacterEntryFromDB(ResultSet rs, List<Item> equipped) {
MapleCharacter ret = new MapleCharacter();
public static Character loadCharacterEntryFromDB(ResultSet rs, List<Item> equipped) {
Character ret = new Character();
try {
ret.accountid = rs.getInt("accountid");
@@ -6884,8 +6891,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return ret;
}
public MapleCharacter generateCharacterEntry() {
MapleCharacter ret = new MapleCharacter();
public Character generateCharacterEntry() {
Character ret = new Character();
ret.accountid = this.getAccountID();
ret.id = this.getId();
@@ -6928,7 +6935,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
private void loadCharSkillPoints(String[] skillPoints) {
int sps[] = new int[skillPoints.length];
int[] sps = new int[skillPoints.length];
for (int i = 0; i < skillPoints.length; i++) {
sps[i] = Integer.parseInt(skillPoints[i]);
}
@@ -6944,8 +6951,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
updateRemainingSp(remainingSp, GameConstants.getSkillBook(job.getId()));
}
public static MapleCharacter loadCharFromDB(final int charid, MapleClient client, boolean channelserver) throws SQLException {
MapleCharacter ret = new MapleCharacter();
public static Character loadCharFromDB(final int charid, MapleClient client, boolean channelserver) throws SQLException {
Character ret = new Character();
ret.client = client;
ret.id = charid;
@@ -7529,7 +7536,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}
} catch (Exception e) {
FilePrinter.printError(FilePrinter.EXCEPTION_CAUGHT, e, "MapleCharacter.mobKilled. CID: " + this.id + " last Quest Processed: " + lastQuestProcessed);
FilePrinter.printError(FilePrinter.EXCEPTION_CAUGHT, e, "Character.mobKilled. CID: " + this.id + " last Quest Processed: " + lastQuestProcessed);
}
}
@@ -7686,7 +7693,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
addHP(-bloodEffect.getX());
sendPacket(PacketCreator.showOwnBuffEffect(bloodEffect.getSourceId(), 5));
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBuffEffect(getId(), bloodEffect.getSourceId(), 5), false);
getMap().broadcastMessage(Character.this, PacketCreator.showBuffEffect(getId(), bloodEffect.getSourceId(), 5), false);
}
}, 4000, 4000);
}
@@ -7927,7 +7934,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
prtLock.lock();
try {
if (party != null) {
for (MapleCharacter partychar : this.getPartyMembersOnSameMap()) {
for (Character partychar : this.getPartyMembersOnSameMap()) {
sendPacket(PacketCreator.updatePartyMemberHP(partychar.getId(), partychar.getHp(), partychar.getCurrentMaxHp()));
}
}
@@ -7964,9 +7971,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
effLock.lock();
chrLock.lock();
try {
if (this.coolDowns.containsKey(skillId)) {
this.coolDowns.remove(skillId);
}
} finally {
chrLock.unlock();
effLock.unlock();
@@ -8343,9 +8348,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
Calendar c = Calendar.getInstance();
if (notAutosave) {
FilePrinter.print(FilePrinter.SAVING_CHARACTER, "Attempting to save " + name + " at " + c.getTime().toString());
FilePrinter.print(FilePrinter.SAVING_CHARACTER, "Attempting to save " + name + " at " + c.getTime());
} else {
FilePrinter.print(FilePrinter.AUTOSAVING_CHARACTER, "Attempting to autosave " + name + " at " + c.getTime().toString());
FilePrinter.print(FilePrinter.AUTOSAVING_CHARACTER, "Attempting to autosave " + name + " at " + c.getTime());
}
Server.getInstance().updateCharacterEntry(this);
@@ -9179,7 +9184,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
this.miniGame = miniGame;
}
public void setMiniGamePoints(MapleCharacter visitor, int winnerslot, boolean omok) {
public void setMiniGamePoints(Character visitor, int winnerslot, boolean omok) {
if (omok) {
if (winnerslot == 1) {
this.omokwins++;
@@ -9370,7 +9375,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
Inventory inv = getInventory(type);
inv.lockInventory();
try {
Item item = inv.getItem((short) slot);
Item item = inv.getItem(slot);
if (item == null) { //Basic check
return (0);
}
@@ -9617,7 +9622,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}
public void showMapOwnershipInfo(MapleCharacter mapOwner) {
public void showMapOwnershipInfo(Character mapOwner) {
long curTime = Server.getInstance().getCurrentTime();
if (nextWarningTime < curTime) {
nextWarningTime = curTime + (60 * 1000); // show underlevel info again after 1 minute
@@ -9809,7 +9814,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (party != null) {
int curmaxhp = getCurrentMaxHp();
int curhp = getHp();
for (MapleCharacter partychar : this.getPartyMembersOnSameMap()) {
for (Character partychar : this.getPartyMembersOnSameMap()) {
partychar.sendPacket(PacketCreator.updatePartyMemberHP(getId(), curhp, curmaxhp));
}
}
@@ -9855,7 +9860,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
UPDATE, FORFEIT, COMPLETE, INFO
}
private void announceUpdateQuestInternal(MapleCharacter chr, Pair<DelayedQuestUpdate, Object[]> questUpdate) {
private void announceUpdateQuestInternal(Character chr, Pair<DelayedQuestUpdate, Object[]> questUpdate) {
Object[] objs = questUpdate.getRight();
switch (questUpdate.getLeft()) {
@@ -10199,7 +10204,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}, 5000);
Server.getInstance().broadcastGMMessage(this.getWorld(), PacketCreator.serverNotice(6, MapleCharacter.makeMapleReadable(this.name) + " was autobanned for " + reason));
Server.getInstance().broadcastGMMessage(this.getWorld(), PacketCreator.serverNotice(6, Character.makeMapleReadable(this.name) + " was autobanned for " + reason));
}
public void block(int reason, int days, String desc) {
@@ -10256,11 +10261,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public boolean isTrockMap(int id) {
int index = trockmaps.indexOf(id);
if (index != -1) {
return true;
}
return false;
return index != -1;
}
public int getVipTrockSize() {
@@ -10289,11 +10290,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public boolean isVipTrockMap(int id) {
int index = viptrockmaps.indexOf(id);
if (index != -1) {
return true;
}
return false;
return index != -1;
}
public AutobanManager getAutobanManager() {
@@ -10445,24 +10442,36 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void clearCpqTimer() {
if (cpqSchedule != null) { cpqSchedule.cancel(true); }
if (cpqSchedule != null) {
cpqSchedule.cancel(true);
}
cpqSchedule = null;
}
public final void empty(final boolean remove) {
if (dragonBloodSchedule != null) { dragonBloodSchedule.cancel(true); }
if (dragonBloodSchedule != null) {
dragonBloodSchedule.cancel(true);
}
dragonBloodSchedule = null;
if (hpDecreaseTask != null) { hpDecreaseTask.cancel(true); }
if (hpDecreaseTask != null) {
hpDecreaseTask.cancel(true);
}
hpDecreaseTask = null;
if (beholderHealingSchedule != null) { beholderHealingSchedule.cancel(true); }
if (beholderHealingSchedule != null) {
beholderHealingSchedule.cancel(true);
}
beholderHealingSchedule = null;
if (beholderBuffSchedule != null) { beholderBuffSchedule.cancel(true); }
if (beholderBuffSchedule != null) {
beholderBuffSchedule.cancel(true);
}
beholderBuffSchedule = null;
if (berserkSchedule != null) { berserkSchedule.cancel(true); }
if (berserkSchedule != null) {
berserkSchedule.cancel(true);
}
berserkSchedule = null;
unregisterChairBuff();
@@ -10471,20 +10480,28 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
cancelSkillCooldownTask();
cancelExpirationTask();
if (questExpireTask != null) { questExpireTask.cancel(true); }
if (questExpireTask != null) {
questExpireTask.cancel(true);
}
questExpireTask = null;
if (recoveryTask != null) { recoveryTask.cancel(true); }
if (recoveryTask != null) {
recoveryTask.cancel(true);
}
recoveryTask = null;
if (extraRecoveryTask != null) { extraRecoveryTask.cancel(true); }
if (extraRecoveryTask != null) {
extraRecoveryTask.cancel(true);
}
extraRecoveryTask = null;
// already done on unregisterChairBuff
/* if (chairRecoveryTask != null) { chairRecoveryTask.cancel(true); }
chairRecoveryTask = null; */
if (pendantOfSpirit != null) { pendantOfSpirit.cancel(true); }
if (pendantOfSpirit != null) {
pendantOfSpirit.cancel(true);
}
pendantOfSpirit = null;
clearCpqTimer();
@@ -10569,7 +10586,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public boolean getWhiteChat() {
return !isGM() ? false : whiteChat;
return isGM() && whiteChat;
}
public void toggleWhiteChat() {
@@ -10731,7 +10748,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (!success) {
con.rollback();
} else {
FilePrinter.print(FilePrinter.CHANGE_CHARACTER_NAME, "Name change applied : from \"" + getName() + "\" to \"" + newName + "\" at " + Calendar.getInstance().getTime().toString());
FilePrinter.print(FilePrinter.CHANGE_CHARACTER_NAME, "Name change applied : from \"" + getName() + "\" to \"" + newName + "\" at " + Calendar.getInstance().getTime());
}
con.setAutoCommit(true);
} catch (SQLException e) {
@@ -10915,17 +10932,29 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public static String checkWorldTransferEligibility(Connection con, int characterId, int oldWorld, int newWorld) {
if(!YamlConfig.config.server.ALLOW_CASHSHOP_WORLD_TRANSFER) return "World transfers disabled.";
if (!YamlConfig.config.server.ALLOW_CASHSHOP_WORLD_TRANSFER) {
return "World transfers disabled.";
}
int accountId = -1;
try (PreparedStatement ps = con.prepareStatement("SELECT accountid, level, guildid, guildrank, partnerId, familyId FROM characters WHERE id = ?")) {
ps.setInt(1, characterId);
ResultSet rs = ps.executeQuery();
if(!rs.next()) return "Character does not exist.";
if (!rs.next()) {
return "Character does not exist.";
}
accountId = rs.getInt("accountid");
if(rs.getInt("level") < 20) return "Character is under level 20.";
if(rs.getInt("familyId") != -1) return "Character is in family.";
if(rs.getInt("partnerId") != 0) return "Character is married.";
if(rs.getInt("guildid") != 0 && rs.getInt("guildrank") < 2) return "Character is the leader of a guild.";
if (rs.getInt("level") < 20) {
return "Character is under level 20.";
}
if (rs.getInt("familyId") != -1) {
return "Character is in family.";
}
if (rs.getInt("partnerId") != 0) {
return "Character is married.";
}
if (rs.getInt("guildid") != 0 && rs.getInt("guildrank") < 2) {
return "Character is the leader of a guild.";
}
} catch (SQLException e) {
e.printStackTrace();
FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e);
@@ -10950,8 +10979,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
ps.setInt(1, accountId);
ps.setInt(2, newWorld);
ResultSet rs = ps.executeQuery();
if(!rs.next()) return "SQL Error";
if(rs.getInt("rowcount") >= 3) return "Too many characters on destination world.";
if (!rs.next()) {
return "SQL Error";
}
if (rs.getInt("rowcount") >= 3) {
return "Too many characters on destination world.";
}
} catch (SQLException e) {
e.printStackTrace();
FilePrinter.printError(FilePrinter.CHANGE_CHARACTER_NAME, e);

18
src/main/java/client/MapleClient.java
View File

@@ -94,7 +94,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
private volatile boolean inTransition;
private io.netty.channel.Channel ioChannel;
private MapleCharacter player;
private Character player;
private int channel = 1;
private int accId = -4;
private boolean loggedIn = false;
@@ -288,11 +288,11 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
return getChannelServer().getEventSM().getEventManager(event);
}
public MapleCharacter getPlayer() {
public Character getPlayer() {
return player;
}
public void setPlayer(MapleCharacter player) {
public void setPlayer(Character player) {
this.player = player;
}
@@ -304,11 +304,11 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
this.sendPacket(PacketCreator.getCharList(this, server, 0));
}
public List<MapleCharacter> loadCharacters(int serverId) {
List<MapleCharacter> chars = new ArrayList<>(15);
public List<Character> loadCharacters(int serverId) {
List<Character> chars = new ArrayList<>(15);
try {
for (CharNameAndId cni : loadCharactersInternal(serverId)) {
chars.add(MapleCharacter.loadCharFromDB(cni.id, this, false));
chars.add(Character.loadCharFromDB(cni.id, this, false));
}
} catch (Exception e) {
e.printStackTrace();
@@ -1091,7 +1091,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
public boolean deleteCharacter(int cid, int senderAccId) {
try {
MapleCharacter chr = MapleCharacter.loadCharFromDB(cid, this, false);
Character chr = Character.loadCharFromDB(cid, this, false);
Integer partyid = chr.getWorldServer().getCharacterPartyid(cid);
if (partyid != null) {
@@ -1105,7 +1105,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
this.setPlayer(null);
}
return MapleCharacter.deleteCharFromDB(chr, senderAccId);
return Character.deleteCharFromDB(chr, senderAccId);
} catch (SQLException ex) {
ex.printStackTrace();
return false;
@@ -1221,7 +1221,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
}
for (World w : Server.getInstance().getWorlds()) {
for (MapleCharacter chr : w.getPlayerStorage().getAllCharacters()) {
for (Character chr : w.getPlayerStorage().getAllCharacters()) {
if (accid == chr.getAccountID()) {
FilePrinter.print(FilePrinter.EXPLOITS, "Player: " + chr.getName() + " has been removed from " + GameConstants.WORLD_NAMES[w.getId()] + ". Possible Dupe attempt.");
chr.getClient().forceDisconnect();

4
src/main/java/client/MapleFamily.java
View File

@@ -158,7 +158,7 @@ public class MapleFamily {
public void broadcast(Packet packet, int ignoreID) {
for(MapleFamilyEntry entry : members.values()) {
MapleCharacter chr = entry.getChr();
Character chr = entry.getChr();
if(chr != null) {
if(chr.getId() == ignoreID) continue;
chr.sendPacket(packet);
@@ -168,7 +168,7 @@ public class MapleFamily {
public void broadcastFamilyInfoUpdate() {
for(MapleFamilyEntry entry : members.values()) {
MapleCharacter chr = entry.getChr();
Character chr = entry.getChr();
if(chr != null) {
chr.sendPacket(PacketCreator.getFamilyInfo(entry));
}

20
src/main/java/client/MapleFamilyEntry.java
View File

@@ -40,7 +40,7 @@ import java.util.List;
public class MapleFamilyEntry {
private final int characterID;
private volatile MapleFamily family;
private volatile MapleCharacter character;
private volatile Character character;
private volatile MapleFamilyEntry senior;
private final MapleFamilyEntry[] juniors = new MapleFamilyEntry[2];
@@ -66,17 +66,17 @@ public class MapleFamilyEntry {
this.job = job;
}
public MapleCharacter getChr() {
public Character getChr() {
return character;
}
public void setCharacter(MapleCharacter newCharacter) {
public void setCharacter(Character newCharacter) {
if(newCharacter == null) cacheOffline(newCharacter);
else newCharacter.setFamilyEntry(this);
this.character = newCharacter;
}
private void cacheOffline(MapleCharacter chr) {
private void cacheOffline(Character chr) {
if(chr != null) {
charName = chr.getName();
level = chr.getLevel();
@@ -209,19 +209,19 @@ public class MapleFamilyEntry {
}
public String getName() {
MapleCharacter chr = character;
Character chr = character;
if(chr != null) return chr.getName();
else return charName;
}
public int getLevel() {
MapleCharacter chr = character;
Character chr = character;
if(chr != null) return chr.getLevel();
else return level;
}
public MapleJob getJob() {
MapleCharacter chr = character;
Character chr = character;
if(chr != null) return chr.getJob();
else return job;
}
@@ -264,7 +264,7 @@ public class MapleFamilyEntry {
if(gain > 0 && countTowardsTotal) {
this.totalReputation += gain;
}
MapleCharacter chr = getChr();
Character chr = getChr();
if(chr != null) chr.sendPacket(PacketCreator.sendGainRep(gain, from != null ? from.getName() : ""));
}
@@ -424,7 +424,7 @@ public class MapleFamilyEntry {
public void announceToSenior(Packet packet, boolean includeSuperSenior) {
MapleFamilyEntry senior = getSenior();
if(senior != null) {
MapleCharacter seniorChr = senior.getChr();
Character seniorChr = senior.getChr();
if(seniorChr != null) seniorChr.sendPacket(packet);
senior = senior.getSenior();
if(includeSuperSenior && senior != null) {
@@ -437,7 +437,7 @@ public class MapleFamilyEntry {
public void updateSeniorFamilyInfo(boolean includeSuperSenior) {
MapleFamilyEntry senior = getSenior();
if(senior != null) {
MapleCharacter seniorChr = senior.getChr();
Character seniorChr = senior.getChr();
if(seniorChr != null) seniorChr.sendPacket(PacketCreator.getFamilyInfo(senior));
senior = senior.getSenior();
if(includeSuperSenior && senior != null) {

4
src/main/java/client/MapleMount.java
View File

@@ -30,10 +30,10 @@ public class MapleMount {
private int tiredness;
private int exp;
private int level;
private MapleCharacter owner;
private Character owner;
private boolean active;
public MapleMount(MapleCharacter owner, int id, int skillid) {
public MapleMount(Character owner, int id, int skillid) {
this.itemid = id;
this.skillid = skillid;
this.tiredness = 0;

2
src/main/java/client/MapleRing.java
View File

@@ -103,7 +103,7 @@ public class MapleRing implements Comparable<MapleRing> {
}
}
public static Pair<Integer, Integer> createRing(int itemid, final MapleCharacter partner1, final MapleCharacter partner2) {
public static Pair<Integer, Integer> createRing(int itemid, final Character partner1, final Character partner2) {
try {
if (partner1 == null) {
return new Pair<>(-3, -3);

10
src/main/java/client/autoban/AutobanFactory.java
View File

@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package client.autoban;
import client.MapleCharacter;
import client.Character;
import config.YamlConfig;
import net.packet.logging.MapleLogger;
import net.server.Server;
@@ -83,19 +83,19 @@ public enum AutobanFactory {
ban.addPoint(this, reason);
}
public void alert(MapleCharacter chr, String reason) {
public void alert(Character chr, String reason) {
if(YamlConfig.config.server.USE_AUTOBAN == true) {
if (chr != null && MapleLogger.ignored.contains(chr.getId())){
return;
}
Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), PacketCreator.sendYellowTip((chr != null ? MapleCharacter.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason));
Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), PacketCreator.sendYellowTip((chr != null ? Character.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason));
}
if (YamlConfig.config.server.USE_AUTOBAN_LOG) {
FilePrinter.print(FilePrinter.AUTOBAN_WARNING, (chr != null ? MapleCharacter.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason);
FilePrinter.print(FilePrinter.AUTOBAN_WARNING, (chr != null ? Character.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason);
}
}
public void autoban(MapleCharacter chr, String value) {
public void autoban(Character chr, String value) {
if(YamlConfig.config.server.USE_AUTOBAN == true) {
chr.autoban("Autobanned for (" + this.name() + ": " + value + ")");
//chr.sendPolice("You will be disconnected for (" + this.name() + ": " + value + ")");

8
src/main/java/client/autoban/AutobanManager.java
View File

@@ -5,7 +5,7 @@
package client.autoban;
import client.MapleCharacter;
import client.Character;
import config.YamlConfig;
import net.server.Server;
import tools.FilePrinter;
@@ -18,7 +18,7 @@ import java.util.Map;
* @author kevintjuh93
*/
public class AutobanManager {
private MapleCharacter chr;
private Character chr;
private Map<AutobanFactory, Integer> points = new HashMap<>();
private Map<AutobanFactory, Long> lastTime = new HashMap<>();
private int misses = 0;
@@ -29,7 +29,7 @@ public class AutobanManager {
private byte[] timestampcounter = new byte[20];
public AutobanManager(MapleCharacter chr) {
public AutobanManager(Character chr) {
this.chr = chr;
}
@@ -58,7 +58,7 @@ public class AutobanManager {
}
if (YamlConfig.config.server.USE_AUTOBAN_LOG) {
// Lets log every single point too.
FilePrinter.print(FilePrinter.AUTOBAN_WARNING, MapleCharacter.makeMapleReadable(chr.getName()) + " caused " + fac.name() + " " + reason);
FilePrinter.print(FilePrinter.AUTOBAN_WARNING, Character.makeMapleReadable(chr.getName()) + " caused " + fac.name() + " " + reason);
}
}

8
src/main/java/client/command/commands/gm0/GmCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -45,15 +45,15 @@ public class GmCommand extends Command {
"Do not ask if you can receive help, just state your issue.",
"Do not say 'I have a bug to report', just state it.",
};
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1 || params[0].length() < 3) { // #goodbye 'hi'
player.dropMessage(5, "Your message was too short. Please provide as much detail as possible.");
return;
}
String message = player.getLastCommandMessage();
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[GM Message]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[GM Message]:" + Character.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(1, message));
FilePrinter.printError(FilePrinter.COMMAND_GM, MapleCharacter.makeMapleReadable(player.getName()) + ": " + message);
FilePrinter.printError(FilePrinter.COMMAND_GM, Character.makeMapleReadable(player.getName()) + ": " + message);
player.dropMessage(5, "Your message '" + message + "' was sent to GMs.");
player.dropMessage(5, tips[Randomizer.nextInt(tips.length)]);
}

4
src/main/java/client/command/commands/gm0/JoinEventCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.events.gm.MapleEvent;
@@ -36,7 +36,7 @@ public class JoinEventCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if(!FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
MapleEvent event = c.getChannelServer().getEvent();
if(event != null) {

4
src/main/java/client/command/commands/gm0/LeaveEventCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class LeaveEventCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
int returnMap = player.getSavedLocation("EVENT");
if(returnMap != -1) {
if(player.getOla() != null) {

4
src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -38,7 +38,7 @@ public class MapOwnerClaimCommand extends Command {
public void execute(MapleClient c, String[] params) {
if (c.tryacquireClient()) {
try {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if (YamlConfig.config.server.USE_MAP_OWNERSHIP_SYSTEM) {
if (chr.getEventInstance() == null) {

8
src/main/java/client/command/commands/gm0/OnlineCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -36,12 +36,12 @@ public class OnlineCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
for (Channel ch : Server.getInstance().getChannelsFromWorld(player.getWorld())) {
player.yellowMessage("Players in Channel " + ch.getId() + ":");
for (MapleCharacter chr : ch.getPlayerStorage().getAllCharacters()) {
for (Character chr : ch.getPlayerStorage().getAllCharacters()) {
if (!chr.isGM()) {
player.message(" >> " + MapleCharacter.makeMapleReadable(chr.getName()) + " is at " + chr.getMap().getMapName() + ".");
player.message(" >> " + Character.makeMapleReadable(chr.getName()) + " is at " + chr.getMap().getMapName() + ".");
}
}
}

4
src/main/java/client/command/commands/gm0/RanksCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -39,7 +39,7 @@ public class RanksCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
List<Pair<String, Integer>> worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld());
player.sendPacket(GuildPackets.showPlayerRanks(9010000, worldRanking));

4
src/main/java/client/command/commands/gm0/RatesCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class RatesCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
// 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";

4
src/main/java/client/command/commands/gm0/ReadPointsCommand.java
View File

@@ -1,6 +1,6 @@
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -12,7 +12,7 @@ public class ReadPointsCommand extends Command {
@Override
public void execute(MapleClient client, String[] params) {
MapleCharacter player = client.getPlayer();
Character player = client.getPlayer();
if (params.length > 2) {
player.yellowMessage("Syntax: @points (rp|vp|all)");
return;

8
src/main/java/client/command/commands/gm0/ReportBugCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -37,16 +37,16 @@ public class ReportBugCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.dropMessage(5, "Message too short and not sent. Please do @bug <bug>");
return;
}
String message = player.getLastCommandMessage();
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[Bug]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[Bug]:" + Character.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(1, message));
FilePrinter.printError(FilePrinter.COMMAND_BUG, MapleCharacter.makeMapleReadable(player.getName()) + ": " + message);
FilePrinter.printError(FilePrinter.COMMAND_BUG, Character.makeMapleReadable(player.getName()) + ": " + message);
player.dropMessage(5, "Your bug '" + message + "' was submitted successfully to our developers. Thank you!");
}

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

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class ShowRatesCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
String showMsg = "#eEXP RATE#n" + "\r\n";
showMsg += "World EXP Rate: #k" + c.getWorldServer().getExpRate() + "x#k" + "\r\n";
showMsg += "Player EXP Rate: #k" + player.getRawExpRate() + "x#k" + "\r\n";

4
src/main/java/client/command/commands/gm0/StatDexCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class StatDexCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
int remainingAp = player.getRemainingAp();
int amount;

4
src/main/java/client/command/commands/gm0/StatIntCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class StatIntCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
int remainingAp = player.getRemainingAp();
int amount;

4
src/main/java/client/command/commands/gm0/StatLukCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class StatLukCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
int remainingAp = player.getRemainingAp();
int amount;

4
src/main/java/client/command/commands/gm0/StatStrCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class StatStrCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
int remainingAp = player.getRemainingAp();
int amount;
if (params.length > 0) {

4
src/main/java/client/command/commands/gm1/BossHpCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm1;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.life.MapleMonster;
@@ -35,7 +35,7 @@ public class BossHpCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
for(MapleMonster monster : player.getMap().getAllMonsters()) {
if(monster != null && monster.isBoss() && monster.getHp() > 0) {
long percent = monster.getHp() * 100L / monster.getMaxHp();

4
src/main/java/client/command/commands/gm1/BuffMeCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm1;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.SkillFactory;
import client.command.Command;
@@ -35,7 +35,7 @@ public class BuffMeCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
SkillFactory.getSkill(4101004).getEffect(SkillFactory.getSkill(4101004).getMaxLevel()).applyTo(player);
SkillFactory.getSkill(2311003).getEffect(SkillFactory.getSkill(2311003).getMaxLevel()).applyTo(player);
SkillFactory.getSkill(1301007).getEffect(SkillFactory.getSkill(1301007).getMaxLevel()).applyTo(player);

4
src/main/java/client/command/commands/gm1/GotoCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm1;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import constants.game.GameConstants;
@@ -73,7 +73,7 @@ public class GotoCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1){
String sendStr = "Syntax: #b@goto <map name>#k. Available areas:\r\n\r\n#rTowns:#k\r\n" + GOTO_TOWNS_INFO;
if (player.isGM()) {

4
src/main/java/client/command/commands/gm1/MobHpCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm1;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.life.MapleMonster;
@@ -35,7 +35,7 @@ public class MobHpCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
for(MapleMonster monster : player.getMap().getAllMonsters()) {
if (monster != null && monster.getHp() > 0) {
player.yellowMessage(monster.getName() + " (" + monster.getId() + ") has " + monster.getHp() + " / " + monster.getMaxHp() + " HP.");

4
src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm1;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.MapleItemInformationProvider;
@@ -40,7 +40,7 @@ public class WhatDropsFromCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.dropMessage(5, "Please do @whatdropsfrom <monster name>");
return;

4
src/main/java/client/command/commands/gm1/WhoDropsCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm1;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.MapleItemInformationProvider;
@@ -43,7 +43,7 @@ public class WhoDropsCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.dropMessage(5, "Please do @whodrops <item name>");
return;

6
src/main/java/client/command/commands/gm2/ApCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class ApCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !ap [<playername>] <newap>");
return;
@@ -48,7 +48,7 @@ public class ApCommand extends Command {
player.changeRemainingAp(newAp, false);
} else {
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
int newAp = Integer.parseInt(params[1]);
if (newAp < 0) newAp = 0;

6
src/main/java/client/command/commands/gm2/BombCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -37,9 +37,9 @@ public class BombCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length > 0) {
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
victim.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(9300166), victim.getPosition());
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, player.getName() + " used !bomb on " + victim.getName()));

4
src/main/java/client/command/commands/gm2/BuffCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.Skill;
import client.SkillFactory;
@@ -36,7 +36,7 @@ public class BuffCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !buff <buffid>");
return;

4
src/main/java/client/command/commands/gm2/BuffMapCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.SkillFactory;
import client.command.Command;
@@ -35,7 +35,7 @@ public class BuffMapCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
SkillFactory.getSkill(9101001).getEffect(SkillFactory.getSkill(9101001).getMaxLevel()).applyTo(player, true);
SkillFactory.getSkill(9101002).getEffect(SkillFactory.getSkill(9101002).getMaxLevel()).applyTo(player, true);
SkillFactory.getSkill(9101003).getEffect(SkillFactory.getSkill(9101003).getMaxLevel()).applyTo(player, true);

4
src/main/java/client/command/commands/gm2/ClearDropsCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class ClearDropsCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
player.getMap().clearDrops(player);
player.dropMessage(5, "Cleared dropped items");
}

4
src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.maps.SavedLocationType;
@@ -35,7 +35,7 @@ public class ClearSavedLocationsCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer(), victim;
Character player = c.getPlayer(), victim;
if (params.length > 0) {
victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);

4
src/main/java/client/command/commands/gm2/ClearSlotCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import client.inventory.InventoryType;
@@ -37,7 +37,7 @@ public class ClearSlotCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !clearslot <all, equip, use, setup, etc or cash.>");
return;

6
src/main/java/client/command/commands/gm2/DcCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,13 +34,13 @@ public class DcCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !dc <playername>");
return;
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim == null) {
victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim == null) {

4
src/main/java/client/command/commands/gm2/EmpowerMeCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.SkillFactory;
import client.command.Command;
@@ -35,7 +35,7 @@ public class EmpowerMeCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
final int[] array = {2311003, 2301004, 1301007, 4101004, 2001002, 1101007, 1005, 2301003, 5121009, 1111002, 4111001, 4111002, 4211003, 4211005, 1321000, 2321004, 3121002};
for (int i : array) {
SkillFactory.getSkill(i).getEffect(SkillFactory.getSkill(i).getMaxLevel()).applyTo(player);

4
src/main/java/client/command/commands/gm2/HealCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class HealCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
player.healHpMp();
}

4
src/main/java/client/command/commands/gm2/HideCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.SkillFactory;
import client.command.Command;
@@ -35,7 +35,7 @@ public class HideCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
SkillFactory.getSkill(9101004).getEffect(SkillFactory.getSkill(9101004).getMaxLevel()).applyTo(player);
}

4
src/main/java/client/command/commands/gm2/IdCommand.java
View File

@@ -1,6 +1,6 @@
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.ThreadManager;
@@ -31,7 +31,7 @@ public class IdCommand extends Command {
@Override
public void execute(MapleClient client, final String[] params) {
final MapleCharacter player = client.getPlayer();
final Character player = client.getPlayer();
if (params.length < 2) {
player.yellowMessage("Syntax: !id <type> <query>");
return;

4
src/main/java/client/command/commands/gm2/ItemCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import client.inventory.Pet;
@@ -39,7 +39,7 @@ public class ItemCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !item <itemid> <quantity>");

4
src/main/java/client/command/commands/gm2/ItemDropCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import client.inventory.InventoryType;
@@ -40,7 +40,7 @@ public class ItemDropCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !drop <itemid> <quantity>");

6
src/main/java/client/command/commands/gm2/JailCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.maps.MapleMap;
@@ -36,7 +36,7 @@ public class JailCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !jail <playername> [<minutes>]");
return;
@@ -51,7 +51,7 @@ public class JailCommand extends Command {
}
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
victim.addJailExpirationTime(minutesJailed * 60 * 1000);

6
src/main/java/client/command/commands/gm2/JobCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleJob;
import client.command.Command;
@@ -35,7 +35,7 @@ public class JobCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length == 1) {
int jobid = Integer.parseInt(params[0]);
if (jobid < 0 || jobid >= 2200) {
@@ -46,7 +46,7 @@ public class JobCommand extends Command {
player.changeJob(MapleJob.getById(jobid));
player.equipChanged();
} else if (params.length == 2) {
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
int jobid = Integer.parseInt(params[1]);

4
src/main/java/client/command/commands/gm2/LevelCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class LevelCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !level <newlevel>");
return;

4
src/main/java/client/command/commands/gm2/LevelProCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class LevelProCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !levelpro <newlevel>");
return;

3
src/main/java/client/command/commands/gm2/MaxSkillCommand.java
View File

@@ -23,6 +23,7 @@
*/
package client.command.commands.gm2;
import client.Character;
import client.*;
import client.command.Command;
import provider.MapleData;
@@ -36,7 +37,7 @@ public class MaxSkillCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
for (MapleData skill_ : MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) {
try {
Skill skill = SkillFactory.getSkill(Integer.parseInt(skill_.getName()));

4
src/main/java/client/command/commands/gm2/MaxStatCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleStat;
import client.command.Command;
@@ -36,7 +36,7 @@ public class MaxStatCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
player.loseExp(player.getExp(), false, false);
player.setLevel(255);
player.resetPlayerRates();

6
src/main/java/client/command/commands/gm2/ReachCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.maps.MapleMap;
@@ -35,13 +35,13 @@ public class ReachCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !reach <playername>");
return;
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null && victim.isLoggedin()) {
if (player.getClient().getChannel() != victim.getClient().getChannel()) {
player.dropMessage(5, "Player '" + victim.getName() + "' is at channel " + victim.getClient().getChannel() + ".");

4
src/main/java/client/command/commands/gm2/RechargeCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import client.inventory.InventoryType;
@@ -38,7 +38,7 @@ public class RechargeCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for (Item torecharge : c.getPlayer().getInventory(InventoryType.USE).list()) {
if (ItemConstants.isThrowingStar(torecharge.getItemId())){

3
src/main/java/client/command/commands/gm2/ResetSkillCommand.java
View File

@@ -23,6 +23,7 @@
*/
package client.command.commands.gm2;
import client.Character;
import client.*;
import client.command.Command;
import provider.MapleData;
@@ -36,7 +37,7 @@ public class ResetSkillCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
for (MapleData skill_ : MapleDataProviderFactory.getDataProvider(WZFiles.STRING).getData("Skill.img").getChildren()) {
try {
Skill skill = SkillFactory.getSkill(Integer.parseInt(skill_.getName()));

4
src/main/java/client/command/commands/gm2/SearchCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import provider.MapleData;
@@ -53,7 +53,7 @@ public class SearchCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 2) {
player.yellowMessage("Syntax: !search <type> <name>");
return;

4
src/main/java/client/command/commands/gm2/SetSlotCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class SetSlotCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !setslot <newlevel>");
return;

4
src/main/java/client/command/commands/gm2/SetStatCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class SetStatCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !setstat <newstat>");
return;

6
src/main/java/client/command/commands/gm2/SpCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class SpCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !sp [<playername>] <newsp>");
return;
@@ -48,7 +48,7 @@ public class SpCommand extends Command {
player.updateRemainingSp(newSp);
} else {
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
int newSp = Integer.parseInt(params[1]);
if (newSp < 0) newSp = 0;

6
src/main/java/client/command/commands/gm2/SummonCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -37,13 +37,13 @@ public class SummonCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !warphere <playername>");
return;
}
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim == null) {
//If victim isn't on current channel, loop all channels on current world.

4
src/main/java/client/command/commands/gm2/UnHideCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.SkillFactory;
import client.command.Command;
@@ -35,7 +35,7 @@ public class UnHideCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
SkillFactory.getSkill(9101004).getEffect(SkillFactory.getSkill(9101004).getMaxLevel()).applyTo(player);
}

6
src/main/java/client/command/commands/gm2/UnJailCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,13 +34,13 @@ public class UnJailCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !unjail <playername>");
return;
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
if (victim.getJailExpirationTimeLeft() <= 0) {
player.message("This player is already free.");

8
src/main/java/client/command/commands/gm2/WarpAreaCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.maps.MapleMap;
@@ -38,7 +38,7 @@ public class WarpAreaCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !warparea <mapid>");
return;
@@ -53,9 +53,9 @@ public class WarpAreaCommand extends Command {
Point pos = player.getPosition();
Collection<MapleCharacter> characters = player.getMap().getAllPlayers();
Collection<Character> characters = player.getMap().getAllPlayers();
for (MapleCharacter victim : characters) {
for (Character victim : characters) {
if (victim.getPosition().distanceSq(pos) <= 50000) {
victim.saveLocationOnWarp();
victim.changeMap(target, target.getRandomPlayerSpawnpoint());

4
src/main/java/client/command/commands/gm2/WarpCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.maps.FieldLimit;
@@ -37,7 +37,7 @@ public class WarpCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !warp <mapid>");
return;

8
src/main/java/client/command/commands/gm2/WarpMapCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.maps.MapleMap;
@@ -37,7 +37,7 @@ public class WarpMapCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !warpmap <mapid>");
return;
@@ -50,9 +50,9 @@ public class WarpMapCommand extends Command {
return;
}
Collection<MapleCharacter> characters = player.getMap().getAllPlayers();
Collection<Character> characters = player.getMap().getAllPlayers();
for (MapleCharacter victim : characters) {
for (Character victim : characters) {
victim.saveLocationOnWarp();
victim.changeMap(target, target.getRandomPlayerSpawnpoint());
}

12
src/main/java/client/command/commands/gm2/WhereaMiCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm2;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.life.MapleMonster;
@@ -40,9 +40,9 @@ public class WhereaMiCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
HashSet<MapleCharacter> chars = new HashSet<>();
HashSet<Character> chars = new HashSet<>();
HashSet<MapleNPC> npcs = new HashSet<>();
HashSet<MaplePlayerNPC> playernpcs = new HashSet<>();
HashSet<MapleMonster> mobs = new HashSet<>();
@@ -51,8 +51,8 @@ public class WhereaMiCommand extends Command {
if (mmo instanceof MapleNPC) {
MapleNPC npc = (MapleNPC) mmo;
npcs.add(npc);
} else if (mmo instanceof MapleCharacter) {
MapleCharacter mc = (MapleCharacter) mmo;
} else if (mmo instanceof Character) {
Character mc = (Character) mmo;
chars.add(mc);
} else if (mmo instanceof MapleMonster) {
MapleMonster mob = (MapleMonster) mmo;
@@ -68,7 +68,7 @@ public class WhereaMiCommand extends Command {
player.yellowMessage("Map ID: " + player.getMap().getId());
player.yellowMessage("Players on this map:");
for (MapleCharacter chr : chars) {
for (Character chr : chars) {
player.dropMessage(5, ">> " + chr.getName() + " - " + chr.getId() + " - Oid: " + chr.getObjectId());
}

12
src/main/java/client/command/commands/gm3/BanCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -42,16 +42,16 @@ public class BanCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 2) {
player.yellowMessage("Syntax: !ban <IGN> <Reason> (Please be descriptive)");
return;
}
String ign = params[0];
String reason = joinStringFrom(params, 1);
MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(ign);
Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(ign);
if (target != null) {
String readableTargetName = MapleCharacter.makeMapleReadable(target.getName());
String readableTargetName = Character.makeMapleReadable(target.getName());
String ip = target.getClient().getRemoteAddress();
//Ban ip
try (Connection con = DatabaseConnection.getConnection()) {
@@ -74,10 +74,10 @@ public class BanCommand extends Command {
target.yellowMessage("You have been banned by #b" + c.getPlayer().getName() + " #k.");
target.yellowMessage("Reason: " + reason);
c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0));
final MapleCharacter rip = target;
final Character rip = target;
TimerManager.getInstance().schedule(() -> rip.getClient().disconnect(false, false), 5000); //5 Seconds
Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned."));
} else if (MapleCharacter.ban(ign, reason, false)) {
} else if (Character.ban(ign, reason, false)) {
c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0));
Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned."));
} else {

4
src/main/java/client/command/commands/gm3/ChatCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class ChatCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
player.toggleWhiteChat();
player.message("Your chat is now " + (player.getWhiteChat() ? " white" : "normal") + ".");
}

6
src/main/java/client/command/commands/gm3/CheckDmgCommand.java
View File

@@ -24,7 +24,7 @@
package client.command.commands.gm3;
import client.BuffStat;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -35,8 +35,8 @@ public class CheckDmgCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character player = c.getPlayer();
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
int maxBase = victim.calculateMaxBaseDamage(victim.getTotalWatk());
Integer watkBuff = victim.getBuffedValue(BuffStat.WATK);

4
src/main/java/client/command/commands/gm3/ClosePortalCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class ClosePortalCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !closeportal <portalid>");
return;

6
src/main/java/client/command/commands/gm3/DebuffCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleDisease;
import client.command.Command;
@@ -41,7 +41,7 @@ public class DebuffCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !debuff SLOW|SEDUCE|ZOMBIFY|CONFUSE|STUN|POISON|SEAL|DARKNESS|WEAKEN|CURSE");
return;
@@ -108,7 +108,7 @@ public class DebuffCommand extends Command {
}
for (MapleMapObject mmo : player.getMap().getMapObjectsInRange(player.getPosition(), 777777.7, Arrays.asList(MapleMapObjectType.PLAYER))) {
MapleCharacter chr = (MapleCharacter) mmo;
Character chr = (Character) mmo;
if (chr.getId() != player.getId()) {
chr.giveDebuff(disease, skill);

4
src/main/java/client/command/commands/gm3/EndEventCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class EndEventCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
c.getChannelServer().setEvent(null);
player.dropMessage(5, "You have ended the event. No more players may join.");
}

4
src/main/java/client/command/commands/gm3/ExpedsCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -40,7 +40,7 @@ public class ExpedsCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
for (Channel ch : Server.getInstance().getChannelsFromWorld(c.getWorld())) {
List<MapleExpedition> expeds = ch.getExpeditions();
if (expeds.isEmpty()) {

6
src/main/java/client/command/commands/gm3/FaceCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleStat;
import client.command.Command;
@@ -37,7 +37,7 @@ public class FaceCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !face [<playername>] <faceid>");
return;
@@ -60,7 +60,7 @@ public class FaceCommand extends Command {
player.yellowMessage("Face id '" + params[1] + "' does not exist.");
}
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim == null) {
victim.setFace(itemId);
victim.updateSingleStat(MapleStat.FACE, itemId);

6
src/main/java/client/command/commands/gm3/FameCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleStat;
import client.command.Command;
@@ -35,13 +35,13 @@ public class FameCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 2) {
player.yellowMessage("Syntax: !fame <playername> <gainfame>");
return;
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
victim.setFame(Integer.parseInt(params[1]));
victim.updateSingleStat(MapleStat.FAME, victim.getFame());

4
src/main/java/client/command/commands/gm3/FlyCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -35,7 +35,7 @@ public class FlyCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) { // fly option will become available for any character of that account
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !fly <on/off>");
return;

6
src/main/java/client/command/commands/gm3/GiveMesosCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class GiveMesosCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !givems [<playername>] <gainmeso>");
return;
@@ -66,7 +66,7 @@ public class GiveMesosCommand extends Command {
}
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv_);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv_);
if (victim != null) {
victim.gainMeso((int) mesos_, true);
player.message("MESO given.");

6
src/main/java/client/command/commands/gm3/GiveNxCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class GiveNxCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !givenx [nx, mp, np] [<playername>] <gainnx>");
return;
@@ -72,7 +72,7 @@ public class GiveNxCommand extends Command {
value = Integer.parseInt(params[0]);
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv);
if (victim != null) {
victim.getCashShop().gainCash(type, value);
player.message(typeStr.toUpperCase() + " given.");

6
src/main/java/client/command/commands/gm3/GiveRpCommand.java
View File

@@ -1,6 +1,6 @@
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -11,13 +11,13 @@ public class GiveRpCommand extends Command {
@Override
public void execute(MapleClient client, String[] params) {
MapleCharacter player = client.getPlayer();
Character player = client.getPlayer();
if (params.length < 2) {
player.yellowMessage("Syntax: !giverp <playername> <gainrewardpoint>");
return;
}
MapleCharacter victim = client.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = client.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
victim.setRewardPoints(victim.getRewardPoints() + Integer.parseInt(params[1]));
player.message("RP given. Player " + params[0] + " now has " + victim.getRewardPoints()

6
src/main/java/client/command/commands/gm3/GiveVpCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,13 +34,13 @@ public class GiveVpCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 2) {
player.yellowMessage("Syntax: !givevp <playername> <gainvotepoint>");
return;
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
victim.getClient().addVotePoints(Integer.parseInt(params[1]));
player.message("VP given.");

6
src/main/java/client/command/commands/gm3/HairCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.MapleStat;
import client.command.Command;
@@ -37,7 +37,7 @@ public class HairCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !hair [<playername>] <hairid>");
return;
@@ -61,7 +61,7 @@ public class HairCommand extends Command {
return;
}
MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
victim.setHair(itemId);
victim.updateSingleStat(MapleStat.HAIR, itemId);

6
src/main/java/client/command/commands/gm3/HealMapCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,8 +34,8 @@ public class HealMapCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
for (MapleCharacter mch : player.getMap().getCharacters()) {
Character player = c.getPlayer();
for (Character mch : player.getMap().getCharacters()) {
if (mch != null) {
mch.healHpMp();
}

6
src/main/java/client/command/commands/gm3/HealPersonCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,8 +34,8 @@ public class HealPersonCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character player = c.getPlayer();
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
victim.healHpMp();
} else {

6
src/main/java/client/command/commands/gm3/HpMpCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,8 +34,8 @@ public class HpMpCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
MapleCharacter victim = player;
Character player = c.getPlayer();
Character victim = player;
int statUpdate = 1;
if (params.length == 2) {

6
src/main/java/client/command/commands/gm3/HurtCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,8 +34,8 @@ public class HurtCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character player = c.getPlayer();
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
victim.updateHp(1);
} else {

6
src/main/java/client/command/commands/gm3/IgnoreCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.packet.logging.MapleLogger;
@@ -37,12 +37,12 @@ public class IgnoreCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !ignore <ign>");
return;
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim == null) {
player.message("Player '" + params[0] + "' could not be found on this world.");
return;

6
src/main/java/client/command/commands/gm3/IgnoredCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.packet.logging.MapleLogger;
@@ -35,9 +35,9 @@ public class IgnoredCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
for (Integer cid : MapleLogger.ignored) {
player.yellowMessage(MapleCharacter.getNameById(cid) + " is being ignored.");
player.yellowMessage(Character.getNameById(cid) + " is being ignored.");
}
}
}

6
src/main/java/client/command/commands/gm3/InMapCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,9 +34,9 @@ public class InMapCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
String st = "";
for (MapleCharacter chr : player.getMap().getCharacters()) {
for (Character chr : player.getMap().getCharacters()) {
st += chr.getName() + " ";
}
player.message(st);

4
src/main/java/client/command/commands/gm3/KillAllCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.life.MapleMonster;
@@ -41,7 +41,7 @@ public class KillAllCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
MapleMap map = player.getMap();
List<MapleMapObject> monsters = map.getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER));
int count = 0;

6
src/main/java/client/command/commands/gm3/KillCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -36,13 +36,13 @@ public class KillCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !kill <playername>");
return;
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
victim.updateHpMp(0);
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, player.getName() + " used !kill on " + victim.getName()));

6
src/main/java/client/command/commands/gm3/KillMapCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,8 +34,8 @@ public class KillMapCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
for (MapleCharacter mch : player.getMap().getCharacters()) {
Character player = c.getPlayer();
for (Character mch : player.getMap().getCharacters()) {
mch.updateHp(0);
}
}

4
src/main/java/client/command/commands/gm3/MaxEnergyCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import tools.PacketCreator;
@@ -35,7 +35,7 @@ public class MaxEnergyCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
c.getPlayer().setDojoEnergy(10000);
c.sendPacket(PacketCreator.getEnergy("energy", 10000));
}

6
src/main/java/client/command/commands/gm3/MaxHpMpCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,8 +34,8 @@ public class MaxHpMpCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
MapleCharacter victim = player;
Character player = c.getPlayer();
Character victim = player;
int statUpdate = 1;
if (params.length >= 2) {

6
src/main/java/client/command/commands/gm3/MonitorCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.packet.logging.MapleLogger;
@@ -37,12 +37,12 @@ public class MonitorCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !monitor <ign>");
return;
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim == null) {
player.message("Player '" + params[0] + "' could not be found on this world.");
return;

6
src/main/java/client/command/commands/gm3/MonitorsCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.packet.logging.MapleLogger;
@@ -35,9 +35,9 @@ public class MonitorsCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
for (Integer cid : MapleLogger.monitored) {
player.yellowMessage(MapleCharacter.getNameById(cid) + " is being monitored.");
player.yellowMessage(Character.getNameById(cid) + " is being monitored.");
}
}
}

4
src/main/java/client/command/commands/gm3/MusicCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import constants.game.GameConstants;
@@ -46,7 +46,7 @@ public class MusicCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
String sendMsg = "";

4
src/main/java/client/command/commands/gm3/MuteMapCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class MuteMapCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (player.getMap().isMuted()) {
player.getMap().setMuted(false);
player.dropMessage(5, "The map you are in has been un-muted.");

4
src/main/java/client/command/commands/gm3/NightCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class NightCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
player.getMap().broadcastNightEffect();
player.yellowMessage("Done.");
}

4
src/main/java/client/command/commands/gm3/NoticeCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -36,7 +36,7 @@ public class NoticeCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[Notice] " + player.getLastCommandMessage()));
}
}

4
src/main/java/client/command/commands/gm3/NpcCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.life.MapleLifeFactory;
@@ -37,7 +37,7 @@ public class NpcCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !npc <npcid>");
return;

8
src/main/java/client/command/commands/gm3/OnlineTwoCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -36,15 +36,15 @@ public class OnlineTwoCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
int total = 0;
for (Channel ch : Server.getInstance().getChannelsFromWorld(player.getWorld())) {
int size = ch.getPlayerStorage().getAllCharacters().size();
total += size;
String s = "(Channel " + ch.getId() + " Online: " + size + ") : ";
if (ch.getPlayerStorage().getAllCharacters().size() < 50) {
for (MapleCharacter chr : ch.getPlayerStorage().getAllCharacters()) {
s += MapleCharacter.makeMapleReadable(chr.getName()) + ", ";
for (Character chr : ch.getPlayerStorage().getAllCharacters()) {
s += Character.makeMapleReadable(chr.getName()) + ", ";
}
player.dropMessage(6, s.substring(0, s.length() - 2));
}

4
src/main/java/client/command/commands/gm3/OpenPortalCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm3;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class OpenPortalCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !openportal <portalid>");
return;

Some files were not shown because too many files have changed in this diff Show More