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

Remove "Maple" prefix from MaplePacketCreator name

Browse Source
This commit is contained in:
P0nk
2021-08-19 21:31:57 +02:00
parent 579e3c639f
commit e184f25184
307 changed files with 2285 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ package client;
import net.server.PlayerStorage;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -167,7 +167,7 @@ public class BuddyList {
public void addBuddyRequest(MapleClient c, int cidFrom, String nameFrom, int channelFrom) {
put(new BuddylistEntry(nameFrom, "Default Group", cidFrom, channelFrom, false));
if (pendingRequests.isEmpty()) {
c.announce(MaplePacketCreator.requestBuddylistAdd(cidFrom, c.getPlayer().getId(), nameFrom));
c.announce(PacketCreator.requestBuddylistAdd(cidFrom, c.getPlayer().getId(), nameFrom));
} else {
pendingRequests.push(new CharacterNameAndId(cidFrom, nameFrom));
}

304
src/main/java/client/MapleCharacter.java
View File

@@ -294,7 +294,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
statup.add(new Pair<>(s.getKey(), s.getValue()));
}
announce(MaplePacketCreator.updatePlayerStats(statup, true, MapleCharacter.this));
announce(PacketCreator.updatePlayerStats(statup, true, MapleCharacter.this));
}
});
@@ -757,7 +757,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
combocounter = (short) Math.min(30000, count);
if (count > 0) {
announce(MaplePacketCreator.showCombo(combocounter));
announce(PacketCreator.showCombo(combocounter));
}
}
@@ -823,13 +823,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (isGM() && hide != this.hidden) {
if (!hide) {
this.hidden = false;
announce(MaplePacketCreator.getGMEffect(0x10, (byte) 0));
announce(PacketCreator.getGMEffect(0x10, (byte) 0));
List<MapleBuffStat> dsstat = Collections.singletonList(MapleBuffStat.DARKSIGHT);
getMap().broadcastGMMessage(this, MaplePacketCreator.cancelForeignBuff(id, dsstat), false);
getMap().broadcastGMMessage(this, PacketCreator.cancelForeignBuff(id, dsstat), false);
getMap().broadcastSpawnPlayerMapObjectMessage(this, this, false);
for(MapleSummon ms: this.getSummonsValues()) {
getMap().broadcastNONGMMessage(this, MaplePacketCreator.spawnSummon(ms, false), false);
getMap().broadcastNONGMMessage(this, PacketCreator.spawnSummon(ms, false), false);
}
for (MapleMapObject mo : this.getMap().getMonsters()) {
@@ -838,15 +838,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
} else {
this.hidden = true;
announce(MaplePacketCreator.getGMEffect(0x10, (byte) 1));
announce(PacketCreator.getGMEffect(0x10, (byte) 1));
if (!login) {
getMap().broadcastNONGMMessage(this, MaplePacketCreator.removePlayerFromMap(getId()), false);
getMap().broadcastNONGMMessage(this, PacketCreator.removePlayerFromMap(getId()), false);
}
List<Pair<MapleBuffStat, Integer>> ldsstat = Collections.singletonList(new Pair<MapleBuffStat, Integer>(MapleBuffStat.DARKSIGHT, 0));
getMap().broadcastGMMessage(this, MaplePacketCreator.giveForeignBuff(id, ldsstat), false);
getMap().broadcastGMMessage(this, PacketCreator.giveForeignBuff(id, ldsstat), false);
this.releaseControlledMonsters();
}
announce(MaplePacketCreator.enableActions());
announce(PacketCreator.enableActions());
}
}
@@ -871,9 +871,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
private void cancelPlayerBuffs(List<MapleBuffStat> buffstats) {
if (client.getChannelServer().getPlayerStorage().getCharacterById(getId()) != null) {
updateLocalStats();
client.announce(MaplePacketCreator.cancelBuff(buffstats));
client.announce(PacketCreator.cancelBuff(buffstats));
if (buffstats.size() > 0) {
getMap().broadcastMessage(this, MaplePacketCreator.cancelForeignBuff(getId(), buffstats), false);
getMap().broadcastMessage(this, PacketCreator.cancelForeignBuff(getId(), buffstats), false);
}
}
}
@@ -1034,7 +1034,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
MapleMap map = thisChr.getMap();
if (map != null) {
map.broadcastMessage(thisChr, MaplePacketCreator.showForeignEffect(thisChr.getId(), 8), false);
map.broadcastMessage(thisChr, PacketCreator.showForeignEffect(thisChr.getId(), 8), false);
}
}
}, 777);
@@ -1137,7 +1137,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
statup.add(new Pair<>(MapleStat.AVAILABLEAP, remainingAp));
statup.add(new Pair<>(MapleStat.AVAILABLESP, remainingSp[GameConstants.getSkillBook(job.getId())]));
statup.add(new Pair<>(MapleStat.JOB, job.getId()));
client.announce(MaplePacketCreator.updatePlayerStats(statup, true, this));
client.announce(PacketCreator.updatePlayerStats(statup, true, this));
} finally {
statWlock.unlock();
effLock.unlock();
@@ -1147,16 +1147,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
silentPartyUpdate();
if (dragon != null) {
getMap().broadcastMessage(MaplePacketCreator.removeDragon(dragon.getObjectId()));
getMap().broadcastMessage(PacketCreator.removeDragon(dragon.getObjectId()));
dragon = null;
}
if (this.guildid > 0) {
getGuild().broadcast(MaplePacketCreator.jobMessage(0, job.getId(), name), this.getId());
getGuild().broadcast(PacketCreator.jobMessage(0, job.getId(), name), this.getId());
}
MapleFamily family = getFamily();
if(family != null) {
family.broadcast(MaplePacketCreator.jobMessage(1, job.getId(), name), this.getId());
family.broadcast(PacketCreator.jobMessage(1, job.getId(), name), this.getId());
}
setMasteries(this.job.getId());
guildUpdate();
@@ -1178,7 +1178,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void broadcastAcquaintances(int type, String message) {
broadcastAcquaintances(MaplePacketCreator.serverNotice(type, message));
broadcastAcquaintances(PacketCreator.serverNotice(type, message));
}
public void broadcastAcquaintances(byte[] packet) {
@@ -1219,7 +1219,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void broadcastStance() {
map.broadcastMessage(this, MaplePacketCreator.movePlayer(id, this.getIdleMovement(), getIdleMovementDataLength()), false);
map.broadcastMessage(this, PacketCreator.movePlayer(id, this.getIdleMovement(), getIdleMovementDataLength()), false);
}
public MapleMap getWarpMap(int map) {
@@ -1366,7 +1366,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (pto == null) {
pto = to.getPortal(0);
}
changeMapInternal(to, pto.getPosition(), MaplePacketCreator.getWarpToMap(to, pto.getId(), this));
changeMapInternal(to, pto.getPosition(), PacketCreator.getWarpToMap(to, pto.getId(), this));
canWarpMap = false;
canWarpCounter--;
@@ -1382,7 +1382,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
eventChangedMap(target.getId());
MapleMap to = getWarpMap(target.getId());
changeMapInternal(to, pos, MaplePacketCreator.getWarpToMap(to, 0x80, pos, this));
changeMapInternal(to, pos, PacketCreator.getWarpToMap(to, 0x80, pos, this));
canWarpMap = false;
canWarpCounter--;
@@ -1417,7 +1417,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (pto == null) {
pto = to.getPortal(0);
}
changeMapInternal(to, pto.getPosition(), MaplePacketCreator.getWarpToMap(to, pto.getId(), this));
changeMapInternal(to, pto.getPosition(), PacketCreator.getWarpToMap(to, pto.getId(), this));
canWarpMap = false;
canWarpCounter--;
@@ -1701,7 +1701,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
try {
if (party != null) {
mpc.setMapId(to.getId());
client.announce(MaplePacketCreator.updateParty(client.getChannel(), party, PartyOperation.SILENT_UPDATE, null));
client.announce(PacketCreator.updateParty(client.getChannel(), party, PartyOperation.SILENT_UPDATE, null));
updatePartyMemberHPInternal();
}
} finally {
@@ -1738,7 +1738,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
// if this map has obstacle components moving, make it do so for this client
announce(MaplePacketCreator.environmentMoveList(map.getEnvironment().entrySet()));
announce(PacketCreator.environmentMoveList(map.getEnvironment().entrySet()));
}
}
@@ -1758,11 +1758,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (newLevel > -1) {
skills.put(skill, new SkillEntry(newLevel, newMasterlevel, expiration));
if (!GameConstants.isHiddenSkills(skill.getId())) {
this.client.announce(MaplePacketCreator.updateSkill(skill.getId(), newLevel, newMasterlevel, expiration));
this.client.announce(PacketCreator.updateSkill(skill.getId(), newLevel, newMasterlevel, expiration));
}
} else {
skills.remove(skill);
this.client.announce(MaplePacketCreator.updateSkill(skill.getId(), newLevel, newMasterlevel, -1)); //Shouldn't use expiration anymore :)
this.client.announce(PacketCreator.updateSkill(skill.getId(), newLevel, newMasterlevel, -1)); //Shouldn't use expiration anymore :)
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("DELETE FROM skills WHERE skillid = ? AND characterid = ?")) {
ps.setInt(1, skill.getId());
@@ -1799,11 +1799,11 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
return;
}
client.announce(MaplePacketCreator.showOwnBerserk(skilllevel, berserk));
client.announce(PacketCreator.showOwnBerserk(skilllevel, berserk));
if (!isHidden) {
getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showBerserk(getId(), skilllevel, berserk), false);
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false);
} else {
getMap().broadcastGMMessage(MapleCharacter.this, MaplePacketCreator.showBerserk(getId(), skilllevel, berserk), false);
getMap().broadcastGMMessage(MapleCharacter.this, PacketCreator.showBerserk(getId(), skilllevel, berserk), false);
}
}
}, 5000, 3000);
@@ -1923,7 +1923,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (ob instanceof MapleMapItem) {
MapleMapItem mapitem = (MapleMapItem) ob;
if (System.currentTimeMillis() - mapitem.getDropTime() < 400 || !mapitem.canBePickedBy(this)) {
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.enableActions());
return;
}
@@ -1936,13 +1936,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
mapitem.lockItem();
try {
if (mapitem.isPickedUp()) {
client.announce(MaplePacketCreator.showItemUnavailable());
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.showItemUnavailable());
client.announce(PacketCreator.enableActions());
return;
}
boolean isPet = petIndex > -1;
final byte[] pickupPacket = MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), (isPet) ? 5 : 2, this.getId(), isPet, petIndex);
final byte[] pickupPacket = PacketCreator.removeItemFromMap(mapitem.getObjectId(), (isPet) ? 5 : 2, this.getId(), isPet, petIndex);
Item mItem = mapitem.getItem();
boolean hasSpaceInventory = true;
@@ -1975,21 +1975,21 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
} else if (MapleInventoryManipulator.addFromDrop(client, mItem, true)) {
this.getMap().pickItemDrop(pickupPacket, mapitem);
} else {
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.enableActions());
return;
}
} else {
client.announce(MaplePacketCreator.showItemUnavailable());
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.showItemUnavailable());
client.announce(PacketCreator.enableActions());
return;
}
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.enableActions());
return;
}
if (!this.needQuestItem(mapitem.getQuest(), mapitem.getItemId())) {
client.announce(MaplePacketCreator.showItemUnavailable());
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.showItemUnavailable());
client.announce(PacketCreator.enableActions());
return;
}
@@ -2010,7 +2010,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
itemScript = info;
} else {
if (!MapleInventoryManipulator.addFromDrop(client, mItem, true)) {
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.enableActions());
return;
}
}
@@ -2026,14 +2026,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
updateAriantScore();
}
} else {
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.enableActions());
return;
}
this.getMap().pickItemDrop(pickupPacket, mapitem);
} else if(!hasSpaceInventory) {
client.announce(MaplePacketCreator.getInventoryFull());
client.announce(MaplePacketCreator.getShowInventoryFull());
client.announce(PacketCreator.getInventoryFull());
client.announce(PacketCreator.getShowInventoryFull());
}
} finally {
mapitem.unlockItem();
@@ -2044,7 +2044,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
ism.runItemScript(client, itemScript);
}
}
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.enableActions());
}
public int countItem(int itemid) {
@@ -2075,7 +2075,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void announceBattleshipHp() {
announce(MaplePacketCreator.skillCooldown(5221999, battleshipHp));
announce(PacketCreator.skillCooldown(5221999, battleshipHp));
}
public void decreaseBattleshipHp(int decrease) {
@@ -2083,7 +2083,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (battleshipHp <= 0) {
Skill battleship = SkillFactory.getSkill(Corsair.BATTLE_SHIP);
int cooldown = battleship.getEffect(getSkillLevel(battleship)).getCooldown();
announce(MaplePacketCreator.skillCooldown(Corsair.BATTLE_SHIP, cooldown));
announce(PacketCreator.skillCooldown(Corsair.BATTLE_SHIP, cooldown));
addCooldown(Corsair.BATTLE_SHIP, Server.getInstance().getCurrentTime(), (long)(cooldown * 1000));
removeCooldown(5221999);
cancelEffectFromBuffStat(MapleBuffStat.MONSTER_RIDING);
@@ -2115,7 +2115,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
private void nextPendingRequest(MapleClient c) {
CharacterNameAndId pendingBuddyRequest = c.getPlayer().getBuddylist().pollPendingRequest();
if (pendingBuddyRequest != null) {
c.announce(MaplePacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName()));
c.announce(PacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName()));
}
}
@@ -2133,7 +2133,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
notifyRemoteChannel(client, getWorldServer().find(otherCid), otherCid, BuddyList.BuddyOperation.DELETED);
}
bl.remove(otherCid);
client.announce(MaplePacketCreator.updateBuddylist(getBuddylist().getBuddies()));
client.announce(PacketCreator.updateBuddylist(getBuddylist().getBuddies()));
nextPendingRequest(client);
}
@@ -2458,8 +2458,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if(MapleCharacter.this.getHp() < localmaxhp) {
byte recHP = (byte) (healHP / YamlConfig.config.server.CHAIR_EXTRA_HEAL_MULTIPLIER);
client.announce(MaplePacketCreator.showOwnRecovery(recHP));
getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showRecovery(id, recHP), false);
client.announce(PacketCreator.showOwnRecovery(recHP));
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, recHP), false);
} else if (MapleCharacter.this.getMp() >= localmaxmp) {
stopChairTask(); // optimizing schedule management when player is already with full pool.
}
@@ -2506,8 +2506,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if(MapleCharacter.this.getHp() < localmaxhp) {
if(healHP > 0) {
client.announce(MaplePacketCreator.showOwnRecovery(healHP));
getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showRecovery(id, healHP), false);
client.announce(PacketCreator.showOwnRecovery(healHP));
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, healHP), false);
}
}
@@ -2614,9 +2614,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
final List<Pair<MapleDisease, Integer>> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX())));
if (disease != MapleDisease.SLOW) {
map.broadcastMessage(MaplePacketCreator.giveForeignDebuff(id, debuff, skill));
map.broadcastMessage(PacketCreator.giveForeignDebuff(id, debuff, skill));
} else {
map.broadcastMessage(MaplePacketCreator.giveForeignSlowDebuff(id, debuff, skill));
map.broadcastMessage(PacketCreator.giveForeignSlowDebuff(id, debuff, skill));
}
}
}
@@ -2631,9 +2631,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
final List<Pair<MapleDisease, Integer>> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX())));
if (disease != MapleDisease.SLOW) {
this.announce(MaplePacketCreator.giveForeignDebuff(cid, debuff, skill));
this.announce(PacketCreator.giveForeignDebuff(cid, debuff, skill));
} else {
this.announce(MaplePacketCreator.giveForeignSlowDebuff(cid, debuff, skill));
this.announce(PacketCreator.giveForeignSlowDebuff(cid, debuff, skill));
}
}
}
@@ -2661,12 +2661,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
final List<Pair<MapleDisease, Integer>> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX())));
client.announce(MaplePacketCreator.giveDebuff(debuff, skill));
client.announce(PacketCreator.giveDebuff(debuff, skill));
if (disease != MapleDisease.SLOW) {
map.broadcastMessage(this, MaplePacketCreator.giveForeignDebuff(id, debuff, skill), false);
map.broadcastMessage(this, PacketCreator.giveForeignDebuff(id, debuff, skill), false);
} else {
map.broadcastMessage(this, MaplePacketCreator.giveForeignSlowDebuff(id, debuff, skill), false);
map.broadcastMessage(this, PacketCreator.giveForeignSlowDebuff(id, debuff, skill), false);
}
}
}
@@ -2674,12 +2674,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public void dispelDebuff(MapleDisease debuff) {
if (hasDisease(debuff)) {
long mask = debuff.getValue();
announce(MaplePacketCreator.cancelDebuff(mask));
announce(PacketCreator.cancelDebuff(mask));
if (debuff != MapleDisease.SLOW) {
map.broadcastMessage(this, MaplePacketCreator.cancelForeignDebuff(id, mask), false);
map.broadcastMessage(this, PacketCreator.cancelForeignDebuff(id, mask), false);
} else {
map.broadcastMessage(this, MaplePacketCreator.cancelForeignSlowDebuff(id), false);
map.broadcastMessage(this, PacketCreator.cancelForeignSlowDebuff(id), false);
}
chrLock.lock();
@@ -2789,7 +2789,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void dropMessage(int type, String message) {
client.announce(MaplePacketCreator.serverNotice(type, message));
client.announce(PacketCreator.serverNotice(type, message));
}
public void enteredScript(String script, int mapid) {
@@ -2909,7 +2909,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
MapleCoolDownValueHolder mcdvh = bel.getValue();
if(curTime >= mcdvh.startTime + mcdvh.length) {
removeCooldown(mcdvh.skillId);
client.announce(MaplePacketCreator.skillCooldown(mcdvh.skillId, 0));
client.announce(PacketCreator.skillCooldown(mcdvh.skillId, 0));
}
}
}
@@ -2954,7 +2954,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
forceUpdateItem(item); //TEST :3
} else if (expiration != -1 && expiration < currenttime) {
if (!ItemConstants.isPet(item.getItemId())) {
client.announce(MaplePacketCreator.itemExpired(item.getItemId()));
client.announce(PacketCreator.itemExpired(item.getItemId()));
toberemove.add(item);
if (ItemConstants.isRateCoupon(item.getItemId())) {
deletedCoupon = true;
@@ -2966,7 +2966,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
if (ItemConstants.isExpirablePet(item.getItemId())) {
client.announce(MaplePacketCreator.itemExpired(item.getItemId()));
client.announce(PacketCreator.itemExpired(item.getItemId()));
toberemove.add(item);
} else {
item.setExpiration(-1);
@@ -3017,7 +3017,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
final List<ModifyInventory> mods = new LinkedList<>();
mods.add(new ModifyInventory(3, item));
mods.add(new ModifyInventory(0, item));
client.announce(MaplePacketCreator.modifyInventory(true, mods));
client.announce(PacketCreator.modifyInventory(true, mods));
}
public void gainGachaExp() {
@@ -3094,7 +3094,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
white = false;
}
client.announce(MaplePacketCreator.getShowExpGain((int) gain, equip, party, inChat, white));
client.announce(PacketCreator.getShowExpGain((int) gain, equip, party, inChat, white));
}
private synchronized void gainExpInternal(long gain, int equip, int party, boolean show, boolean inChat, boolean white) { // need of method synchonization here detected thanks to MedicOP
@@ -3158,10 +3158,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
updateSingleStat(MapleStat.FAME, thisFame);
if (fromPlayer != null) {
fromPlayer.announce(MaplePacketCreator.giveFameResponse(mode, getName(), thisFame));
announce(MaplePacketCreator.receiveFame(mode, fromPlayer.getName()));
fromPlayer.announce(PacketCreator.giveFameResponse(mode, getName(), thisFame));
announce(PacketCreator.receiveFame(mode, fromPlayer.getName()));
} else {
announce(MaplePacketCreator.getShowFameGain(delta));
announce(PacketCreator.getShowFameGain(delta));
}
return true;
@@ -3201,15 +3201,15 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (gain != 0) {
updateSingleStat(MapleStat.MESO, (int) nextMeso, enableActions);
if (show) {
client.announce(MaplePacketCreator.getShowMesoGain(gain, inChat));
client.announce(PacketCreator.getShowMesoGain(gain, inChat));
}
} else {
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.enableActions());
}
}
public void genericGuildMessage(int code) {
this.client.announce(MaplePacketCreator.genericGuildMessage((byte) code));
this.client.announce(PacketCreator.genericGuildMessage((byte) code));
}
public int getAccountID() {
@@ -3712,7 +3712,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
MapleSummon summon = summons.get(summonId);
if (summon != null) {
getMap().broadcastMessage(MaplePacketCreator.removeSummon(summon, true), summon.getPosition());
getMap().broadcastMessage(PacketCreator.removeSummon(summon, true), summon.getPosition());
getMap().removeMapObject(summon);
removeVisibleMapObject(summon);
@@ -4032,8 +4032,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
if (!inactiveStats.isEmpty()) {
client.announce(MaplePacketCreator.cancelBuff(inactiveStats));
getMap().broadcastMessage(this, MaplePacketCreator.cancelForeignBuff(getId(), inactiveStats), false);
client.announce(PacketCreator.cancelBuff(inactiveStats));
getMap().broadcastMessage(this, PacketCreator.cancelForeignBuff(getId(), inactiveStats), false);
}
}
@@ -4308,7 +4308,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (this.isRidingBattleship()) {
List<Pair<MapleBuffStat, Integer>> statups = new ArrayList<>(1);
statups.add(new Pair<>(MapleBuffStat.MONSTER_RIDING, 0));
this.announce(MaplePacketCreator.giveBuff(1932000, 5221006, statups));
this.announce(PacketCreator.giveBuff(1932000, 5221006, statups));
this.announceBattleshipHp();
}
}
@@ -4402,9 +4402,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
addHP(healEffect.getHp());
client.announce(MaplePacketCreator.showOwnBuffEffect(beholder, 2));
getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.summonSkill(getId(), beholder, 5), true);
getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showOwnBuffEffect(beholder, 2), false);
client.announce(PacketCreator.showOwnBuffEffect(beholder, 2));
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.summonSkill(getId(), beholder, 5), true);
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showOwnBuffEffect(beholder, 2), false);
}
}, healInterval, healInterval);
}
@@ -4420,9 +4420,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
buffEffect.applyTo(MapleCharacter.this);
client.announce(MaplePacketCreator.showOwnBuffEffect(beholder, 2));
getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.summonSkill(getId(), beholder, (int) (Math.random() * 3) + 6), true);
getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showBuffeffect(getId(), beholder, 2), false);
client.announce(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);
}
}, buffInterval, buffInterval);
}
@@ -4454,8 +4454,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
addHP(heal);
client.announce(MaplePacketCreator.showOwnRecovery(heal));
getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showRecovery(id, heal), false);
client.announce(PacketCreator.showOwnRecovery(heal));
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showRecovery(id, heal), false);
}
}, healInterval, healInterval);
} finally {
@@ -4812,7 +4812,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
Set<Integer> exclItems = pe.getValue();
if (!exclItems.isEmpty()) {
client.announce(MaplePacketCreator.loadExceptionList(this.getId(), pe.getKey(), petIndex, new ArrayList<>(exclItems)));
client.announce(PacketCreator.loadExceptionList(this.getId(), pe.getKey(), petIndex, new ArrayList<>(exclItems)));
chrLock.lock();
try {
@@ -4836,7 +4836,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
Set<Integer> exclItems = pe.getValue();
if (!exclItems.isEmpty()) {
c.announce(MaplePacketCreator.loadExceptionList(this.getId(), pe.getKey(), petIndex, new ArrayList<>(exclItems)));
c.announce(PacketCreator.loadExceptionList(this.getId(), pe.getKey(), petIndex, new ArrayList<>(exclItems)));
}
}
}
@@ -5935,7 +5935,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
//Server.getInstance().getGuild(guildid, world, mgc).gainGP(40);
int allianceId = getGuild().getAllianceId();
if (allianceId > 0) {
Server.getInstance().allianceMessage(allianceId, MaplePacketCreator.updateAllianceJobLevel(this), getId(), -1);
Server.getInstance().allianceMessage(allianceId, PacketCreator.updateAllianceJobLevel(this), getId(), -1);
}
} catch (Exception e) {
e.printStackTrace();
@@ -5954,10 +5954,10 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.ENERGY_CHARGE, energybar));
setBuffedValue(MapleBuffStat.ENERGY_CHARGE, energybar);
client.announce(MaplePacketCreator.giveBuff(energybar, 0, stat));
client.announce(MaplePacketCreator.showOwnBuffEffect(energycharge.getId(), 2));
getMap().broadcastMessage(this, MaplePacketCreator.showBuffeffect(id, energycharge.getId(), 2));
getMap().broadcastMessage(this, MaplePacketCreator.giveForeignBuff(energybar, stat));
client.announce(PacketCreator.giveBuff(energybar, 0, stat));
client.announce(PacketCreator.showOwnBuffEffect(energycharge.getId(), 2));
getMap().broadcastMessage(this, PacketCreator.showBuffeffect(id, energycharge.getId(), 2));
getMap().broadcastMessage(this, PacketCreator.giveForeignBuff(energybar, stat));
}
if (energybar >= 10000 && energybar < 11000) {
energybar = 15000;
@@ -5968,8 +5968,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
energybar = 0;
List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.ENERGY_CHARGE, energybar));
setBuffedValue(MapleBuffStat.ENERGY_CHARGE, energybar);
client.announce(MaplePacketCreator.giveBuff(energybar, 0, stat));
getMap().broadcastMessage(chr, MaplePacketCreator.cancelForeignFirstDebuff(id, ((long) 1) << 50));
client.announce(PacketCreator.giveBuff(energybar, 0, stat));
getMap().broadcastMessage(chr, PacketCreator.cancelForeignFirstDebuff(id, ((long) 1) << 50));
}
}, ceffect.getDuration());
}
@@ -5980,8 +5980,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
Skill combo = SkillFactory.getSkill(skillid);
List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.COMBO, 1));
setBuffedValue(MapleBuffStat.COMBO, 1);
client.announce(MaplePacketCreator.giveBuff(skillid, combo.getEffect(getSkillLevel(combo)).getDuration() + (int) ((getBuffedStarttime(MapleBuffStat.COMBO) - System.currentTimeMillis())), stat));
getMap().broadcastMessage(this, MaplePacketCreator.giveForeignBuff(getId(), stat), false);
client.announce(PacketCreator.giveBuff(skillid, combo.getEffect(getSkillLevel(combo)).getDuration() + (int) ((getBuffedStarttime(MapleBuffStat.COMBO) - System.currentTimeMillis())), stat));
getMap().broadcastMessage(this, PacketCreator.giveForeignBuff(getId(), stat), false);
}
public boolean hasEntered(String script) {
@@ -6412,7 +6412,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
final String names = (getMedalText() + name);
getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, String.format(LEVEL_200, names, maxClassLevel, names)));
getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, String.format(LEVEL_200, names, maxClassLevel, names)));
}
}
@@ -6439,18 +6439,18 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
statup.add(new Pair<>(MapleStat.STR, str));
statup.add(new Pair<>(MapleStat.DEX, dex));
client.announce(MaplePacketCreator.updatePlayerStats(statup, true, this));
client.announce(PacketCreator.updatePlayerStats(statup, true, this));
} finally {
statWlock.unlock();
effLock.unlock();
}
getMap().broadcastMessage(this, MaplePacketCreator.showForeignEffect(getId(), 0), false);
getMap().broadcastMessage(this, PacketCreator.showForeignEffect(getId(), 0), false);
setMPC(new MaplePartyCharacter(this));
silentPartyUpdate();
if (this.guildid > 0) {
getGuild().broadcast(MaplePacketCreator.levelUpMessage(2, level, name), this.getId());
getGuild().broadcast(PacketCreator.levelUpMessage(2, level, name), this.getId());
}
if (level % 20 == 0) {
@@ -6497,7 +6497,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
MapleFamilyEntry senior = familyEntry.getSenior();
if(senior != null) { //only send the message to direct senior
MapleCharacter seniorChr = senior.getChr();
if(seniorChr != null) seniorChr.announce(MaplePacketCreator.levelUpMessage(1, level, getName()));
if(seniorChr != null) seniorChr.announce(PacketCreator.levelUpMessage(1, level, getName()));
}
}
}
@@ -7495,7 +7495,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void yellowMessage(String m) {
announce(MaplePacketCreator.sendYellowTip(m));
announce(PacketCreator.sendYellowTip(m));
}
public void raiseQuestMobCount(int id) {
@@ -7544,7 +7544,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (getCP() < losing) {
losing = getCP();
}
getMap().broadcastMessage(MaplePacketCreator.playerDiedMessage(getName(), losing, getTeam()));
getMap().broadcastMessage(PacketCreator.playerDiedMessage(getName(), losing, getTeam()));
gainCP(-losing);
return;
}
@@ -7603,7 +7603,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
unsitChairInternal();
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.enableActions());
}
private void unsitChairInternal() {
@@ -7615,13 +7615,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
setChair(-1);
if (unregisterChairBuff()) {
getMap().broadcastMessage(this, MaplePacketCreator.cancelForeignChairSkillEffect(this.getId()), false);
getMap().broadcastMessage(this, PacketCreator.cancelForeignChairSkillEffect(this.getId()), false);
}
getMap().broadcastMessage(this, MaplePacketCreator.showChair(this.getId(), 0), false);
getMap().broadcastMessage(this, PacketCreator.showChair(this.getId(), 0), false);
}
announce(MaplePacketCreator.cancelChair(-1));
announce(PacketCreator.cancelChair(-1));
}
public void sitChair(int itemId) {
@@ -7629,16 +7629,16 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (itemId >= 1000000) { // sit on item chair
if (chair.get() < 0) {
setChair(itemId);
getMap().broadcastMessage(this, MaplePacketCreator.showChair(this.getId(), itemId), false);
getMap().broadcastMessage(this, PacketCreator.showChair(this.getId(), itemId), false);
}
announce(MaplePacketCreator.enableActions());
announce(PacketCreator.enableActions());
} else if (itemId >= 0) { // sit on map chair
if (chair.get() < 0) {
setChair(itemId);
if (registerChairBuff()) {
getMap().broadcastMessage(this, MaplePacketCreator.giveForeignChairSkillEffect(this.getId()), false);
getMap().broadcastMessage(this, PacketCreator.giveForeignChairSkillEffect(this.getId()), false);
}
announce(MaplePacketCreator.cancelChair(itemId));
announce(PacketCreator.cancelChair(itemId));
}
} else { // stand up
unsitChairInternal();
@@ -7683,8 +7683,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
addHP(-bloodEffect.getX());
announce(MaplePacketCreator.showOwnBuffEffect(bloodEffect.getSourceId(), 5));
getMap().broadcastMessage(MapleCharacter.this, MaplePacketCreator.showBuffeffect(getId(), bloodEffect.getSourceId(), 5), false);
announce(PacketCreator.showOwnBuffEffect(bloodEffect.getSourceId(), 5));
getMap().broadcastMessage(MapleCharacter.this, PacketCreator.showBuffeffect(getId(), bloodEffect.getSourceId(), 5), false);
}
}, 4000, 4000);
}
@@ -7908,7 +7908,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
enforceMaxHpMp();
if (!hpmpupdate.isEmpty()) {
client.announce(MaplePacketCreator.updatePlayerStats(hpmpupdate, true, this));
client.announce(PacketCreator.updatePlayerStats(hpmpupdate, true, this));
}
if (oldmaxhp != localmaxhp) { // thanks Wh1SK3Y (Suwaidy) for pointing out a deadlock occuring related to party members HP
@@ -7926,7 +7926,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
try {
if (party != null) {
for (MapleCharacter partychar : this.getPartyMembersOnSameMap()) {
announce(MaplePacketCreator.updatePartyMemberHP(partychar.getId(), partychar.getHp(), partychar.getCurrentMaxHp()));
announce(PacketCreator.updatePartyMemberHP(partychar.getId(), partychar.getHp(), partychar.getCurrentMaxHp()));
}
}
} finally {
@@ -7943,7 +7943,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (mcvh.skillId != id) {
coolDowns.remove(mcvh.skillId);
if (packet) {
client.announce(MaplePacketCreator.skillCooldown(mcvh.skillId, 0));
client.announce(PacketCreator.skillCooldown(mcvh.skillId, 0));
}
}
}
@@ -8742,7 +8742,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void sendPolice(int greason, String reason, int duration) {
announce(MaplePacketCreator.sendPolice(String.format("You have been blocked by the#b %s Police for %s.#k", "Cosmic", reason)));
announce(PacketCreator.sendPolice(String.format("You have been blocked by the#b %s Police for %s.#k", "Cosmic", reason)));
this.isbanned = true;
TimerManager.getInstance().schedule(new Runnable() {
@Override
@@ -8755,14 +8755,14 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public void sendPolice(String text) {
String message = getName() + " received this - " + text;
if (Server.getInstance().isGmOnline(this.getWorld())) { //Alert and log if a GM is online
Server.getInstance().broadcastGMMessage(this.getWorld(), MaplePacketCreator.sendYellowTip(message));
Server.getInstance().broadcastGMMessage(this.getWorld(), PacketCreator.sendYellowTip(message));
FilePrinter.print(FilePrinter.AUTOBAN_WARNING, message);
} else { //Auto DC and log if no GM is online
client.disconnect(false, false);
FilePrinter.print(FilePrinter.AUTOBAN_DC, message);
}
//Server.getInstance().broadcastGMMessage(0, MaplePacketCreator.serverNotice(1, getName() + " received this - " + text));
//announce(MaplePacketCreator.sendPolice(text));
//Server.getInstance().broadcastGMMessage(0, PacketCreator.serverNotice(1, getName() + " received this - " + text));
//announce(PacketCreator.sendPolice(text));
//this.isbanned = true;
//TimerManager.getInstance().schedule(new Runnable() {
// @Override
@@ -8773,7 +8773,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
public void sendKeymap() {
client.announce(MaplePacketCreator.getKeymap(keymap));
client.announce(PacketCreator.getKeymap(keymap));
}
public void sendQuickmap() {
@@ -8784,12 +8784,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
pQuickslotKeyMapped = new MapleQuickslotBinding(MapleQuickslotBinding.DEFAULT_QUICKSLOTS);
}
this.announce(MaplePacketCreator.QuickslotMappedInit(pQuickslotKeyMapped));
this.announce(PacketCreator.QuickslotMappedInit(pQuickslotKeyMapped));
}
public void sendMacros() {
// Always send the macro packet to fix a client side bug when switching characters.
client.announce(MaplePacketCreator.getMacros(skillMacros));
client.announce(PacketCreator.getMacros(skillMacros));
}
public SkillMacro[] getMacros() {
@@ -8826,7 +8826,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public void setBuddyCapacity(int capacity) {
buddylist.setCapacity(capacity);
client.announce(MaplePacketCreator.updateBuddyCapacity(capacity));
client.announce(PacketCreator.updateBuddyCapacity(capacity));
}
public void setBuffedValue(MapleBuffStat effect, int value) {
@@ -9300,7 +9300,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (newLimit != -1) {
this.saveCharToDB();
if (update) {
client.announce(MaplePacketCreator.updateInventorySlotLimit(type, newLimit));
client.announce(PacketCreator.updateInventorySlotLimit(type, newLimit));
}
return true;
} else {
@@ -9602,7 +9602,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public void showDojoClock() {
if (GameConstants.isDojoBossArea(map.getId())) {
client.announce(MaplePacketCreator.getClock((int) (getDojoTimeLeft() / 1000)));
client.announce(PacketCreator.getClock((int) (getDojoTimeLeft() / 1000)));
}
}
@@ -9632,7 +9632,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
strLines.add("");
strLines.add(this.getClient().getChannelServer().getServerMessage().isEmpty() ? 0 : 1, "Get off my lawn!!");
this.announce(MaplePacketCreator.getAvatarMega(mapOwner, medal, this.getClient().getChannel(), 5390006, strLines, true));
this.announce(PacketCreator.getAvatarMega(mapOwner, medal, this.getClient().getChannel(), 5390006, strLines, true));
}
}
@@ -9652,7 +9652,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
rs.last();
int count = rs.getRow();
rs.first();
client.announce(MaplePacketCreator.showNotes(rs, count));
client.announce(PacketCreator.showNotes(rs, count));
}
} catch (SQLException e) {
e.printStackTrace();
@@ -9731,7 +9731,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if(maplemount != null) {
int tiredness = maplemount.incrementAndGetTiredness();
this.getMap().broadcastMessage(MaplePacketCreator.updateMount(this.getId(), maplemount, false));
this.getMap().broadcastMessage(PacketCreator.updateMount(this.getId(), maplemount, false));
if (tiredness > 99) {
maplemount.setTiredness(99);
this.dispelSkill(this.getJobType() * 10000000 + 1004);
@@ -9781,13 +9781,13 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
this.getClient().getWorldServer().unregisterPetHunger(this, petIdx);
getMap().broadcastMessage(this, MaplePacketCreator.showPet(this, pet, true, hunger), true);
getMap().broadcastMessage(this, PacketCreator.showPet(this, pet, true, hunger), true);
removePet(pet, shift_left);
commitExcludedItems();
client.announce(MaplePacketCreator.petStatUpdate(this));
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.petStatUpdate(this));
client.announce(PacketCreator.enableActions());
}
public void updateMacros(int position, SkillMacro updateMacro) {
@@ -9808,7 +9808,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
int curmaxhp = getCurrentMaxHp();
int curhp = getHp();
for (MapleCharacter partychar : this.getPartyMembersOnSameMap()) {
partychar.announce(MaplePacketCreator.updatePartyMemberHP(getId(), curhp, curmaxhp));
partychar.announce(PacketCreator.updatePartyMemberHP(getId(), curhp, curmaxhp));
}
}
}
@@ -9858,20 +9858,20 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
switch (questUpdate.getLeft()) {
case UPDATE:
announce(MaplePacketCreator.updateQuest(chr, (MapleQuestStatus) objs[0], (Boolean) objs[1]));
announce(PacketCreator.updateQuest(chr, (MapleQuestStatus) objs[0], (Boolean) objs[1]));
break;
case FORFEIT:
announce(MaplePacketCreator.forfeitQuest((Short) objs[0]));
announce(PacketCreator.forfeitQuest((Short) objs[0]));
break;
case COMPLETE:
announce(MaplePacketCreator.completeQuest((Short) objs[0], (Long) objs[1]));
announce(PacketCreator.completeQuest((Short) objs[0], (Long) objs[1]));
break;
case INFO:
MapleQuestStatus qs = (MapleQuestStatus) objs[0];
announce(MaplePacketCreator.updateQuestInfo(qs.getQuest().getId(), qs.getNpc()));
announce(PacketCreator.updateQuestInfo(qs.getQuest().getId(), qs.getNpc()));
break;
}
}
@@ -9932,7 +9932,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
private void expireQuest(MapleQuest quest) {
if (quest.forfeit(this)) {
announce(MaplePacketCreator.questExpire(quest.getId()));
announce(PacketCreator.questExpire(quest.getId()));
}
}
@@ -10027,7 +10027,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public void questTimeLimit(final MapleQuest quest, int seconds) {
registerQuestExpire(quest, seconds * 1000);
announce(MaplePacketCreator.addQuestTimeLimit(quest.getId(), seconds * 1000));
announce(PacketCreator.addQuestTimeLimit(quest.getId(), seconds * 1000));
}
public void questTimeLimit2(final MapleQuest quest, long expires) {
@@ -10045,7 +10045,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
private void updateSingleStat(MapleStat stat, int newval, boolean itemReaction) {
announce(MaplePacketCreator.updatePlayerStats(Collections.singletonList(new Pair<>(stat, Integer.valueOf(newval))), itemReaction, this));
announce(PacketCreator.updatePlayerStats(Collections.singletonList(new Pair<>(stat, Integer.valueOf(newval))), itemReaction, this));
}
public void announce(final byte[] packet) {
@@ -10064,22 +10064,22 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
@Override
public void sendDestroyData(MapleClient client) {
client.announce(MaplePacketCreator.removePlayerFromMap(this.getObjectId()));
client.announce(PacketCreator.removePlayerFromMap(this.getObjectId()));
}
@Override
public void sendSpawnData(MapleClient client) {
if (!this.isHidden() || client.getPlayer().gmLevel() > 1) {
client.announce(MaplePacketCreator.spawnPlayerMapObject(client, this, false));
client.announce(PacketCreator.spawnPlayerMapObject(client, this, false));
if (buffEffects.containsKey(getJobMapChair(job))) { // mustn't effLock, chrLock sendSpawnData
client.announce(MaplePacketCreator.giveForeignChairSkillEffect(id));
client.announce(PacketCreator.giveForeignChairSkillEffect(id));
}
}
if (this.isHidden()) {
List<Pair<MapleBuffStat, Integer>> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.DARKSIGHT, 0));
getMap().broadcastGMMessage(this, MaplePacketCreator.giveForeignBuff(getId(), dsstat), false);
getMap().broadcastGMMessage(this, PacketCreator.giveForeignBuff(getId(), dsstat), false);
}
}
@@ -10148,7 +10148,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public void blockPortal(String scriptName) {
if (!blockedPortals.contains(scriptName) && scriptName != null) {
blockedPortals.add(scriptName);
client.announce(MaplePacketCreator.enableActions());
client.announce(PacketCreator.enableActions());
}
}
@@ -10172,7 +10172,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public void updateAreaInfo(int area, String info) {
area_info.put(Short.valueOf((short) area), info);
announce(MaplePacketCreator.updateAreaInfo(area, info));
announce(PacketCreator.updateAreaInfo(area, info));
}
public String getAreaInfo(int area) {
@@ -10189,7 +10189,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
this.ban(reason);
announce(MaplePacketCreator.sendPolice(String.format("You have been blocked by the#b %s Police for HACK reason.#k", "Cosmic")));
announce(PacketCreator.sendPolice(String.format("You have been blocked by the#b %s Police for HACK reason.#k", "Cosmic")));
TimerManager.getInstance().schedule(new Runnable() {
@Override
public void run() {
@@ -10197,7 +10197,7 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
}
}, 5000);
Server.getInstance().broadcastGMMessage(this.getWorld(), MaplePacketCreator.serverNotice(6, MapleCharacter.makeMapleReadable(this.name) + " was autobanned for " + reason));
Server.getInstance().broadcastGMMessage(this.getWorld(), PacketCreator.serverNotice(6, MapleCharacter.makeMapleReadable(this.name) + " was autobanned for " + reason));
}
public void block(int reason, int days, String desc) {
@@ -10417,12 +10417,12 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public void broadcastMarriageMessage() {
MapleGuild guild = this.getGuild();
if(guild != null) {
guild.broadcast(MaplePacketCreator.marriageMessage(0, name));
guild.broadcast(PacketCreator.marriageMessage(0, name));
}
MapleFamily family = this.getFamily();
if(family != null) {
family.broadcast(MaplePacketCreator.marriageMessage(1, name));
family.broadcast(PacketCreator.marriageMessage(1, name));
}
}
@@ -11238,9 +11238,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
if (this.getCP() > this.getTotalCP()) {
this.setTotalCP(this.getCP());
}
this.getClient().announce(MaplePacketCreator.CPUpdate(false, this.getCP(), this.getTotalCP(), getTeam()));
this.getClient().announce(PacketCreator.CPUpdate(false, this.getCP(), this.getTotalCP(), getTeam()));
if (this.getParty() != null && getTeam() != -1) {
this.getMap().broadcastMessage(MaplePacketCreator.CPUpdate(true, this.getMonsterCarnival().getCP(team), this.getMonsterCarnival().getTotalCP(team), getTeam()));
this.getMap().broadcastMessage(PacketCreator.CPUpdate(true, this.getMonsterCarnival().getCP(team), this.getMonsterCarnival().getTotalCP(team), getTeam()));
} else {
}
}

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

@@ -30,11 +30,11 @@ import io.netty.handler.timeout.IdleStateEvent;
import net.MaplePacketHandler;
import net.PacketProcessor;
import net.netty.InvalidPacketHeaderException;
import net.packet.logging.LoggingUtil;
import net.packet.logging.MapleLogger;
import net.packet.ByteBufOutPacket;
import net.packet.InPacket;
import net.packet.OutPacket;
import net.packet.logging.LoggingUtil;
import net.packet.logging.MapleLogger;
import net.server.Server;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
@@ -208,7 +208,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
handler.handlePacket(accessor, this);
} catch (final Throwable t) {
FilePrinter.printError(FilePrinter.PACKET_HANDLER + handler.getClass().getName() + ".txt", t, "Error for " + (getPlayer() == null ? "" : "player ; " + getPlayer() + " on map ; " + getPlayer().getMapId() + " - ") + "account ; " + getAccountName() + "\r\n" + accessor);
//client.announce(MaplePacketCreator.enableActions());//bugs sometimes
//client.announce(PacketCreator.enableActions());//bugs sometimes
}
}
@@ -307,7 +307,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
}
public void sendCharList(int server) {
this.announce(MaplePacketCreator.getCharList(this, server, 0));
this.announce(PacketCreator.getCharList(this, server, 0));
}
public List<MapleCharacter> loadCharacters(int serverId) {
@@ -999,7 +999,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
if (guild != null) {
final Server server = Server.getInstance();
server.setGuildMemberOnline(player, false, player.getClient().getChannel());
player.getClient().announce(MaplePacketCreator.showGuildInfo(player));
player.getClient().announce(PacketCreator.showGuildInfo(player));
}
if (bl != null) {
wserv.loggedOff(player.getName(), player.getId(), channel, player.getBuddylist().getBuddyIds());
@@ -1144,7 +1144,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
public void checkIfIdle(final IdleStateEvent event) {
final long pingedAt = System.currentTimeMillis();
announce(MaplePacketCreator.getPing());
announce(PacketCreator.getPing());
TimerManager.getInstance().schedule(() -> {
try {
if (lastPong < pingedAt) {
@@ -1414,12 +1414,12 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
private void announceDisableServerMessage() {
if (!this.getWorldServer().registerDisabledServerMessage(player.getId())) {
announce(MaplePacketCreator.serverMessage(""));
announce(PacketCreator.serverMessage(""));
}
}
public void announceServerMessage() {
announce(MaplePacketCreator.serverMessage(this.getChannelServer().getServerMessage()));
announce(PacketCreator.serverMessage(this.getChannelServer().getServerMessage()));
}
public synchronized void announceBossHpBar(MapleMonster mm, final int mobHash, final byte[] packet) {
@@ -1477,8 +1477,8 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
}
public void announceHint(String msg, int length) {
announce(MaplePacketCreator.sendHint(msg, length, 10));
announce(MaplePacketCreator.enableActions());
announce(PacketCreator.sendHint(msg, length, 10));
announce(PacketCreator.enableActions());
}
public void changeChannel(int channel) {
@@ -1488,18 +1488,18 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
return;
}
if (!player.isAlive() || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
announce(MaplePacketCreator.enableActions());
announce(PacketCreator.enableActions());
return;
} else if (MapleMiniDungeonInfo.isDungeonMap(player.getMapId())) {
announce(MaplePacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
announce(MaplePacketCreator.enableActions());
announce(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
announce(PacketCreator.enableActions());
return;
}
String[] socket = Server.getInstance().getInetSocket(this, getWorld(), channel);
if (socket == null) {
announce(MaplePacketCreator.serverNotice(1, "Channel " + channel + " is currently disabled. Try another channel."));
announce(MaplePacketCreator.enableActions());
announce(PacketCreator.serverNotice(1, "Channel " + channel + " is currently disabled. Try another channel."));
announce(PacketCreator.enableActions());
return;
}
@@ -1530,7 +1530,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
player.setSessionTransitionState();
try {
announce(MaplePacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
announce(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
} catch (IOException e) {
e.printStackTrace();
}
@@ -1586,7 +1586,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
}
public void enableCSActions() {
announce(MaplePacketCreator.enableCSUse(player));
announce(PacketCreator.enableCSUse(player));
}
public boolean canBypassPin() {

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

@@ -25,7 +25,7 @@ import net.server.Server;
import net.server.world.World;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.sql.Connection;
@@ -169,7 +169,7 @@ public class MapleFamily {
for(MapleFamilyEntry entry : members.values()) {
MapleCharacter chr = entry.getChr();
if(chr != null) {
chr.getClient().announce(MaplePacketCreator.getFamilyInfo(entry));
chr.getClient().announce(PacketCreator.getFamilyInfo(entry));
}
}
}

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

@@ -19,6 +19,12 @@
*/
package client;
import net.server.Server;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.PacketCreator;
import tools.Pair;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
@@ -26,12 +32,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import net.server.Server;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.Pair;
/**
* @author Ubaware
*/
@@ -264,7 +264,7 @@ public class MapleFamilyEntry {
this.totalReputation += gain;
}
MapleCharacter chr = getChr();
if(chr != null) chr.announce(MaplePacketCreator.sendGainRep(gain, from != null ? from.getName() : ""));
if(chr != null) chr.announce(PacketCreator.sendGainRep(gain, from != null ? from.getName() : ""));
}
public void giveReputationToSenior(int gain, boolean includeSuperSenior) {
@@ -437,11 +437,11 @@ public class MapleFamilyEntry {
MapleFamilyEntry senior = getSenior();
if(senior != null) {
MapleCharacter seniorChr = senior.getChr();
if(seniorChr != null) seniorChr.announce(MaplePacketCreator.getFamilyInfo(senior));
if(seniorChr != null) seniorChr.announce(PacketCreator.getFamilyInfo(senior));
senior = senior.getSenior();
if(includeSuperSenior && senior != null) {
seniorChr = senior.getChr();
if(seniorChr != null) seniorChr.announce(MaplePacketCreator.getFamilyInfo(senior));
if(seniorChr != null) seniorChr.announce(PacketCreator.getFamilyInfo(senior));
}
}
}

10
src/main/java/client/MonsterBook.java
View File

@@ -24,7 +24,7 @@ package client;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -54,7 +54,7 @@ public final class MonsterBook {
}
public void addCard(final MapleClient c, final int cardid) {
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.showForeignCardEffect(c.getPlayer().getId()), false);
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.showForeignCardEffect(c.getPlayer().getId()), false);
Integer qty;
lock.lock();
@@ -84,10 +84,10 @@ public final class MonsterBook {
calculateLevel();
}
c.announce(MaplePacketCreator.addCard(false, cardid, qty + 1));
c.announce(MaplePacketCreator.showGainCard());
c.announce(PacketCreator.addCard(false, cardid, qty + 1));
c.announce(PacketCreator.showGainCard());
} else {
c.announce(MaplePacketCreator.addCard(true, cardid, 5));
c.announce(PacketCreator.addCard(true, cardid, 5));
}
}

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

@@ -24,10 +24,10 @@ package client.autoban;
import client.MapleCharacter;
import config.YamlConfig;
import net.packet.logging.MapleLogger;
import net.server.Server;
import tools.FilePrinter;
import net.packet.logging.MapleLogger;
import tools.MaplePacketCreator;
import tools.PacketCreator;
/**
*
@@ -88,7 +88,7 @@ public enum AutobanFactory {
if (chr != null && MapleLogger.ignored.contains(chr.getId())){
return;
}
Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), MaplePacketCreator.sendYellowTip((chr != null ? MapleCharacter.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason));
Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), PacketCreator.sendYellowTip((chr != null ? MapleCharacter.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);

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

@@ -27,7 +27,7 @@ import client.MapleClient;
import client.command.Command;
import scripting.npc.NPCScriptManager;
import scripting.quest.QuestScriptManager;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class DisposeCommand extends Command {
{
@@ -38,7 +38,7 @@ public class DisposeCommand extends Command {
public void execute(MapleClient c, String[] params) {
NPCScriptManager.getInstance().dispose(c);
QuestScriptManager.getInstance().dispose(c);
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
c.removeClickedNPC();
c.getPlayer().message("You've been disposed.");
}

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

@@ -28,7 +28,7 @@ import client.MapleClient;
import client.command.Command;
import net.server.Server;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Randomizer;
public class GmCommand extends Command {
@@ -51,8 +51,8 @@ public class GmCommand extends Command {
return;
}
String message = player.getLastCommandMessage();
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.sendYellowTip("[GM Message]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(1, message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[GM Message]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(1, message));
FilePrinter.printError(FilePrinter.COMMAND_GM, MapleCharacter.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/RanksCommand.java
View File

@@ -27,7 +27,7 @@ import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.util.List;
@@ -42,6 +42,6 @@ public class RanksCommand extends Command {
MapleCharacter player = c.getPlayer();
List<Pair<String, Integer>> worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld());
player.announce(MaplePacketCreator.showPlayerRanks(9010000, worldRanking));
player.announce(PacketCreator.showPlayerRanks(9010000, worldRanking));
}
}

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

@@ -28,7 +28,7 @@ import client.MapleClient;
import client.command.Command;
import net.server.Server;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class ReportBugCommand extends Command {
{
@@ -44,8 +44,8 @@ public class ReportBugCommand extends Command {
return;
}
String message = player.getLastCommandMessage();
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.sendYellowTip("[Bug]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(1, message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[Bug]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(1, message));
FilePrinter.printError(FilePrinter.COMMAND_BUG, MapleCharacter.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/gm2/BombCommand.java
View File

@@ -28,7 +28,7 @@ import client.MapleClient;
import client.command.Command;
import net.server.Server;
import server.life.MapleLifeFactory;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class BombCommand extends Command {
{
@@ -42,7 +42,7 @@ public class BombCommand extends Command {
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
victim.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(9300166), victim.getPosition());
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, player.getName() + " used !bomb on " + victim.getName()));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, player.getName() + " used !bomb on " + victim.getName()));
} else {
player.message("Player '" + params[0] + "' could not be found on this world.");
}

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

@@ -25,7 +25,7 @@ package client.command.commands.gm2;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class UnBugCommand extends Command {
{
@@ -34,6 +34,6 @@ public class UnBugCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
c.getPlayer().getMap().broadcastMessage(MaplePacketCreator.enableActions());
c.getPlayer().getMap().broadcastMessage(PacketCreator.enableActions());
}
}

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

@@ -29,7 +29,7 @@ import client.command.Command;
import net.server.Server;
import server.TimerManager;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -73,15 +73,15 @@ public class BanCommand extends Command {
target.ban(reason);
target.yellowMessage("You have been banned by #b" + c.getPlayer().getName() + " #k.");
target.yellowMessage("Reason: " + reason);
c.announce(MaplePacketCreator.getGMEffect(4, (byte) 0));
c.announce(PacketCreator.getGMEffect(4, (byte) 0));
final MapleCharacter rip = target;
TimerManager.getInstance().schedule(() -> rip.getClient().disconnect(false, false), 5000); //5 Seconds
Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned."));
Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned."));
} else if (MapleCharacter.ban(ign, reason, false)) {
c.announce(MaplePacketCreator.getGMEffect(4, (byte) 0));
Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned."));
c.announce(PacketCreator.getGMEffect(4, (byte) 0));
Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned."));
} else {
c.announce(MaplePacketCreator.getGMEffect(6, (byte) 1));
c.announce(PacketCreator.getGMEffect(6, (byte) 1));
}
}
}

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

@@ -26,9 +26,9 @@ package client.command.commands.gm3;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
import net.packet.logging.MapleLogger;
import tools.MaplePacketCreator;
import net.server.Server;
import tools.PacketCreator;
public class IgnoreCommand extends Command {
{
@@ -55,7 +55,7 @@ public class IgnoreCommand extends Command {
}
player.yellowMessage(victim.getName() + " is " + (!monitored_ ? "now being ignored." : "no longer being ignored."));
String message_ = player.getName() + (!monitored_ ? " has started ignoring " : " has stopped ignoring ") + victim.getName() + ".";
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, message_));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, message_));
}
}

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

@@ -27,7 +27,7 @@ import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class KillCommand extends Command {
{
@@ -45,7 +45,7 @@ public class KillCommand extends Command {
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
victim.updateHpMp(0);
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, player.getName() + " used !kill on " + victim.getName()));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, player.getName() + " used !kill on " + victim.getName()));
} else {
player.message("Player '" + params[0] + "' could not be found.");
}

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

@@ -26,7 +26,7 @@ package client.command.commands.gm3;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class MaxEnergyCommand extends Command {
{
@@ -37,6 +37,6 @@ public class MaxEnergyCommand extends Command {
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
c.getPlayer().setDojoEnergy(10000);
c.announce(MaplePacketCreator.getEnergy("energy", 10000));
c.announce(PacketCreator.getEnergy("energy", 10000));
}
}

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

@@ -26,9 +26,9 @@ package client.command.commands.gm3;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
import net.packet.logging.MapleLogger;
import tools.MaplePacketCreator;
import net.server.Server;
import tools.PacketCreator;
public class MonitorCommand extends Command {
{
@@ -55,7 +55,7 @@ public class MonitorCommand extends Command {
}
player.yellowMessage(victim.getId() + " is " + (!monitored ? "now being monitored." : "no longer being monitored."));
String message = player.getName() + (!monitored ? " has started monitoring " : " has stopped monitoring ") + victim.getId() + ".";
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, message));
}
}

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

@@ -27,7 +27,7 @@ import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import constants.game.GameConstants;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class MusicCommand extends Command {
{
@@ -53,14 +53,14 @@ public class MusicCommand extends Command {
sendMsg += "Syntax: #r!music <song>#k\r\n\r\n";
sendMsg += getSongList();
c.announce(MaplePacketCreator.getNPCTalk(1052015, (byte) 0, sendMsg, "00 00", (byte) 0));
c.announce(PacketCreator.getNPCTalk(1052015, (byte) 0, sendMsg, "00 00", (byte) 0));
return;
}
String song = player.getLastCommandMessage();
for (String s : GameConstants.GAME_SONGS) {
if (s.equalsIgnoreCase(song)) { // thanks Masterrulax for finding an issue here
player.getMap().broadcastMessage(MaplePacketCreator.musicChange(s));
player.getMap().broadcastMessage(PacketCreator.musicChange(s));
player.yellowMessage("Now playing song " + s + ".");
return;
}
@@ -70,6 +70,6 @@ public class MusicCommand extends Command {
sendMsg += "Song not found, please enter a song below.\r\n\r\n";
sendMsg += getSongList();
c.announce(MaplePacketCreator.getNPCTalk(1052015, (byte) 0, sendMsg, "00 00", (byte) 0));
c.announce(PacketCreator.getNPCTalk(1052015, (byte) 0, sendMsg, "00 00", (byte) 0));
}
}

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

@@ -27,7 +27,7 @@ import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class NoticeCommand extends Command {
{
@@ -37,6 +37,6 @@ public class NoticeCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, "[Notice] " + player.getLastCommandMessage()));
Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[Notice] " + player.getLastCommandMessage()));
}
}

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

@@ -28,7 +28,7 @@ import client.MapleClient;
import client.command.Command;
import server.life.MapleLifeFactory;
import server.life.MapleNPC;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class NpcCommand extends Command {
{
@@ -50,7 +50,7 @@ public class NpcCommand extends Command {
npc.setRx1(player.getPosition().x - 50);
npc.setFh(player.getMap().getFootholds().findBelow(c.getPlayer().getPosition()).getId());
player.getMap().addMapObject(npc);
player.getMap().broadcastMessage(MaplePacketCreator.spawnNPC(npc));
player.getMap().broadcastMessage(PacketCreator.spawnNPC(npc));
}
}
}

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

@@ -27,7 +27,7 @@ import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class RipCommand extends Command {
{
@@ -37,6 +37,6 @@ public class RipCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, "[RIP]: " + joinStringFrom(params, 1)));
Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + joinStringFrom(params, 1)));
}
}

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

@@ -28,7 +28,7 @@ import client.MapleClient;
import client.command.Command;
import net.server.Server;
import server.events.gm.MapleEvent;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class StartEventCommand extends Command {
{
@@ -42,14 +42,14 @@ public class StartEventCommand extends Command {
if (params.length > 1)
players = Integer.parseInt(params[0]);
c.getChannelServer().setEvent(new MapleEvent(player.getMapId(), players));
Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.earnTitleMessage(
Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.earnTitleMessage(
"[Event] An event has started on "
+ player.getMap().getMapName()
+ " and will allow "
+ players
+ " players to join. Type @joinevent to participate."));
Server.getInstance().broadcastMessage(c.getWorld(),
MaplePacketCreator.serverNotice(6, "[Event] An event has started on "
PacketCreator.serverNotice(6, "[Event] An event has started on "
+ player.getMap().getMapName()
+ " and will allow "
+ players

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

@@ -26,7 +26,7 @@ package client.command.commands.gm3;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class TimerAllCommand extends Command {
{
@@ -43,13 +43,13 @@ public class TimerAllCommand extends Command {
if (params[0].equalsIgnoreCase("remove")) {
for (MapleCharacter victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) {
victim.announce(MaplePacketCreator.removeClock());
victim.announce(PacketCreator.removeClock());
}
} else {
try {
int seconds = Integer.parseInt(params[0]);
for (MapleCharacter victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) {
victim.announce(MaplePacketCreator.getClock(seconds));
victim.announce(PacketCreator.getClock(seconds));
}
} catch (NumberFormatException e) {
player.yellowMessage("Syntax: !timerall <seconds>|remove");

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

@@ -26,7 +26,7 @@ package client.command.commands.gm3;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class TimerCommand extends Command {
{
@@ -44,10 +44,10 @@ public class TimerCommand extends Command {
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
if (params[1].equalsIgnoreCase("remove")) {
victim.announce(MaplePacketCreator.removeClock());
victim.announce(PacketCreator.removeClock());
} else {
try {
victim.announce(MaplePacketCreator.getClock(Integer.parseInt(params[1])));
victim.announce(PacketCreator.getClock(Integer.parseInt(params[1])));
} catch (NumberFormatException e) {
player.yellowMessage("Syntax: !timer <playername> <seconds>|remove");
}

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

@@ -26,7 +26,7 @@ package client.command.commands.gm3;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class TimerMapCommand extends Command {
{
@@ -43,13 +43,13 @@ public class TimerMapCommand extends Command {
if (params[0].equalsIgnoreCase("remove")) {
for (MapleCharacter victim : player.getMap().getCharacters()) {
victim.announce(MaplePacketCreator.removeClock());
victim.announce(PacketCreator.removeClock());
}
} else {
try {
int seconds = Integer.parseInt(params[0]);
for (MapleCharacter victim : player.getMap().getCharacters()) {
victim.announce(MaplePacketCreator.getClock(seconds));
victim.announce(PacketCreator.getClock(seconds));
}
} catch (NumberFormatException e) {
player.yellowMessage("Syntax: !timermap <seconds>|remove");

4
src/main/java/client/command/commands/gm4/BossDropRateCommand.java
View File

@@ -22,7 +22,7 @@ package client.command.commands.gm4;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
/**
*
@@ -43,6 +43,6 @@ public class BossDropRateCommand extends Command {
int bossdroprate = Math.max(Integer.parseInt(params[0]), 1);
c.getWorldServer().setBossDropRate(bossdroprate);
c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Boss Drop Rate has been changed to " + bossdroprate + "x."));
c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Boss Drop Rate has been changed to " + bossdroprate + "x."));
}
}

4
src/main/java/client/command/commands/gm4/DropRateCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm4;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class DropRateCommand extends Command {
{
@@ -43,7 +43,7 @@ public class DropRateCommand extends Command {
int droprate = Math.max(Integer.parseInt(params[0]), 1);
c.getWorldServer().setDropRate(droprate);
c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Drop Rate has been changed to " + droprate + "x."));
c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Drop Rate has been changed to " + droprate + "x."));
}
}

4
src/main/java/client/command/commands/gm4/ExpRateCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm4;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class ExpRateCommand extends Command {
{
@@ -43,6 +43,6 @@ public class ExpRateCommand extends Command {
int exprate = Math.max(Integer.parseInt(params[0]), 1);
c.getWorldServer().setExpRate(exprate);
c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Exp Rate has been changed to " + exprate + "x."));
c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Exp Rate has been changed to " + exprate + "x."));
}
}

4
src/main/java/client/command/commands/gm4/FishingRateCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm4;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class FishingRateCommand extends Command {
{
@@ -43,6 +43,6 @@ public class FishingRateCommand extends Command {
int fishrate = Math.max(Integer.parseInt(params[0]), 1);
c.getWorldServer().setFishingRate(fishrate);
c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Fishing Rate has been changed to " + fishrate + "x."));
c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Fishing Rate has been changed to " + fishrate + "x."));
}
}

4
src/main/java/client/command/commands/gm4/ForceVacCommand.java
View File

@@ -31,7 +31,7 @@ import client.inventory.manipulator.MapleInventoryManipulator;
import server.maps.MapleMapItem;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.Arrays;
import java.util.List;
@@ -70,7 +70,7 @@ public class ForceVacCommand extends Command {
}
}
player.getMap().pickItemDrop(MaplePacketCreator.removeItemFromMap(mapItem.getObjectId(), 2, player.getId()), mapItem);
player.getMap().pickItemDrop(PacketCreator.removeItemFromMap(mapItem.getObjectId(), 2, player.getId()), mapItem);
} finally {
mapItem.unlockItem();
}

4
src/main/java/client/command/commands/gm4/MesoRateCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm4;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class MesoRateCommand extends Command {
{
@@ -43,6 +43,6 @@ public class MesoRateCommand extends Command {
int mesorate = Math.max(Integer.parseInt(params[0]), 1);
c.getWorldServer().setMesoRate(mesorate);
c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Meso Rate has been changed to " + mesorate + "x."));
c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Meso Rate has been changed to " + mesorate + "x."));
}
}

4
src/main/java/client/command/commands/gm4/PnpcCommand.java
View File

@@ -31,7 +31,7 @@ import server.life.MapleLifeFactory;
import server.life.MapleNPC;
import server.maps.MapleMap;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.awt.*;
import java.sql.Connection;
@@ -94,7 +94,7 @@ public class PnpcCommand extends Command {
MapleMap map = ch.getMapFactory().getMap(mapId);
map.addMapObject(npc);
map.broadcastMessage(MaplePacketCreator.spawnNPC(npc));
map.broadcastMessage(PacketCreator.spawnNPC(npc));
}
player.yellowMessage("Pnpc created.");

4
src/main/java/client/command/commands/gm4/QuestRateCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm4;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class QuestRateCommand extends Command {
{
@@ -43,7 +43,7 @@ public class QuestRateCommand extends Command {
int questrate = Math.max(Integer.parseInt(params[0]), 1);
c.getWorldServer().setQuestRate(questrate);
c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Quest Rate has been changed to " + questrate + "x."));
c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Quest Rate has been changed to " + questrate + "x."));
}
}

4
src/main/java/client/command/commands/gm4/TravelRateCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm4;
import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class TravelRateCommand extends Command {
{
@@ -43,6 +43,6 @@ public class TravelRateCommand extends Command {
int travelrate = Math.max(Integer.parseInt(params[0]), 1);
c.getWorldServer().setTravelRate(travelrate);
c.getWorldServer().broadcastPacket(MaplePacketCreator.serverNotice(6, "[Rate] Travel Rate has been changed to " + travelrate + "x."));
c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Travel Rate has been changed to " + travelrate + "x."));
}
}

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

@@ -76,7 +76,7 @@ public class DebugCommand extends Command {
break;
case "packet":
//player.getMap().broadcastMessage(MaplePacketCreator.customPacket(joinStringFrom(params, 1)));
//player.getMap().broadcastMessage(PacketCreator.customPacket(joinStringFrom(params, 1)));
break;
case "portal":

4
src/main/java/client/command/commands/gm6/SaveAllCommand.java
View File

@@ -28,7 +28,7 @@ import client.MapleClient;
import client.command.Command;
import net.server.Server;
import net.server.world.World;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class SaveAllCommand extends Command {
{
@@ -44,7 +44,7 @@ public class SaveAllCommand extends Command {
}
}
String message = player.getName() + " used !saveall.";
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, message));
player.message("All players saved successfully.");
}
}

4
src/main/java/client/command/commands/gm6/WarpWorldCommand.java
View File

@@ -27,7 +27,7 @@ import client.MapleCharacter;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -55,7 +55,7 @@ public class WarpWorldCommand extends Command {
player.setSessionTransitionState();
player.setWorld(worldb);
player.saveCharToDB();//To set the new world :O (true because else 2 player instances are created, one in both worlds)
c.announce(MaplePacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
c.announce(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
} catch (UnknownHostException | NumberFormatException ex) {
ex.printStackTrace();
player.message("Unexpected error when changing worlds, are you sure the world you are trying to warp to has the same amount of channels?");

8
src/main/java/client/creator/CharacterFactory.java
View File

@@ -19,8 +19,8 @@
*/
package client.creator;
import client.MapleClient;
import client.MapleCharacter;
import client.MapleClient;
import client.MapleSkinColor;
import client.inventory.Item;
import client.inventory.MapleInventory;
@@ -29,7 +29,7 @@ import config.YamlConfig;
import net.server.Server;
import server.MapleItemInformationProvider;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
/**
*
@@ -90,10 +90,10 @@ public abstract class CharacterFactory {
if (!newchar.insertNewChar(recipe)) {
return -2;
}
c.announce(MaplePacketCreator.addNewCharEntry(newchar));
c.announce(PacketCreator.addNewCharEntry(newchar));
Server.getInstance().createCharacterEntry(newchar);
Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.sendYellowTip("[New Char]: " + c.getAccountName() + " has created a new character with IGN " + name));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[New Char]: " + c.getAccountName() + " has created a new character with IGN " + name));
FilePrinter.print(FilePrinter.CREATED_CHAR + c.getAccountName() + ".txt", c.getAccountName() + " created character with IGN " + name);
return 0;

6
src/main/java/client/inventory/Equip.java
View File

@@ -26,7 +26,7 @@ import config.YamlConfig;
import constants.game.ExpTable;
import constants.inventory.ItemConstants;
import server.MapleItemInformationProvider;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.Randomizer;
@@ -532,8 +532,8 @@ public class Equip extends Item {
showLevelupMessage(showStr, c); // thanks to Polaris dev team !
c.getPlayer().dropMessage(6, lvupStr);
c.announce(MaplePacketCreator.showEquipmentLevelUp());
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.showForeignEffect(c.getPlayer().getId(), 15));
c.announce(PacketCreator.showEquipmentLevelUp());
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.showForeignEffect(c.getPlayer().getId(), 15));
c.getPlayer().forceUpdateItem(this);
}

8
src/main/java/client/inventory/MaplePet.java
View File

@@ -29,7 +29,7 @@ import server.movement.AbsoluteLifeMovement;
import server.movement.LifeMovement;
import server.movement.LifeMovementFragment;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.awt.*;
@@ -202,8 +202,8 @@ public class MaplePet extends Item {
closeness = newCloseness;
while(newCloseness >= ExpTable.getClosenessNeededForLevel(level)) {
level += 1;
owner.getClient().announce(MaplePacketCreator.showOwnPetLevelUp(slot));
owner.getMap().broadcastMessage(MaplePacketCreator.showPetLevelUp(owner, slot));
owner.getClient().announce(PacketCreator.showOwnPetLevelUp(slot));
owner.getMap().broadcastMessage(PacketCreator.showPetLevelUp(owner, slot));
}
}
@@ -220,7 +220,7 @@ public class MaplePet extends Item {
enjoyed = false;
}
owner.getMap().broadcastMessage(MaplePacketCreator.petFoodResponse(owner.getId(), slot, enjoyed, false));
owner.getMap().broadcastMessage(PacketCreator.petFoodResponse(owner.getId(), slot, enjoyed, false));
saveToDb();
Item petz = owner.getInventory(MapleInventoryType.CASH).getItem(getPosition());

92
src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java
View File

@@ -31,7 +31,7 @@ import constants.inventory.ItemConstants;
import server.MapleItemInformationProvider;
import server.maps.MapleMap;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.awt.*;
import java.util.ArrayList;
@@ -92,7 +92,7 @@ public class MapleInventoryManipulator {
quantity -= (newQ - oldQ);
eItem.setQuantity(newQ);
eItem.setExpiration(expiration);
c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, eItem))));
c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, eItem))));
}
} else {
break;
@@ -109,17 +109,17 @@ public class MapleInventoryManipulator {
nItem.setExpiration(expiration);
short newSlot = inv.addItem(nItem);
if (newSlot == -1) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.getShowInventoryFull());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.getShowInventoryFull());
return false;
}
if (owner != null) {
nItem.setOwner(owner);
}
c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem))));
c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem))));
if(sandboxItem) chr.setHasSandboxItem();
} else {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
}
@@ -129,11 +129,11 @@ public class MapleInventoryManipulator {
nItem.setExpiration(expiration);
short newSlot = inv.addItem(nItem);
if (newSlot == -1) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.getShowInventoryFull());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.getShowInventoryFull());
return false;
}
c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem))));
c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem))));
if(MapleInventoryManipulator.isSandboxItem(nItem)) chr.setHasSandboxItem();
}
} else if (quantity == 1) {
@@ -145,11 +145,11 @@ public class MapleInventoryManipulator {
}
short newSlot = inv.addItem(nEquip);
if (newSlot == -1) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.getShowInventoryFull());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.getShowInventoryFull());
return false;
}
c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nEquip))));
c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nEquip))));
if(MapleInventoryManipulator.isSandboxItem(nEquip)) chr.setHasSandboxItem();
} else {
throw new RuntimeException("Trying to create equip with non-one quantity");
@@ -182,8 +182,8 @@ public class MapleInventoryManipulator {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
int itemid = item.getItemId();
if (ii.isPickupRestricted(itemid) && chr.haveItemWithId(itemid, true)) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.showItemUnavailable());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.showItemUnavailable());
return false;
}
short quantity = item.getQuantity();
@@ -203,7 +203,7 @@ public class MapleInventoryManipulator {
quantity -= (newQ - oldQ);
eItem.setQuantity(newQ);
item.setPosition(eItem.getPosition());
c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, eItem))));
c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, eItem))));
}
} else {
break;
@@ -219,14 +219,14 @@ public class MapleInventoryManipulator {
nItem.setFlag(item.getFlag());
short newSlot = inv.addItem(nItem);
if (newSlot == -1) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.getShowInventoryFull());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.getShowInventoryFull());
item.setQuantity((short) (quantity + newQ));
return false;
}
nItem.setPosition(newSlot);
item.setPosition(newSlot);
c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem))));
c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem))));
if (MapleInventoryManipulator.isSandboxItem(nItem)) chr.setHasSandboxItem();
}
} else {
@@ -236,34 +236,34 @@ public class MapleInventoryManipulator {
short newSlot = inv.addItem(nItem);
if (newSlot == -1) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.getShowInventoryFull());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.getShowInventoryFull());
return false;
}
nItem.setPosition(newSlot);
item.setPosition(newSlot);
c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem))));
c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem))));
if (MapleInventoryManipulator.isSandboxItem(nItem)) chr.setHasSandboxItem();
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
}
} else if (quantity == 1) {
short newSlot = inv.addItem(item);
if (newSlot == -1) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.getShowInventoryFull());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.getShowInventoryFull());
return false;
}
item.setPosition(newSlot);
c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, item))));
c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, item))));
if (MapleInventoryManipulator.isSandboxItem(item)) chr.setHasSandboxItem();
} else {
FilePrinter.printError(FilePrinter.ITEM, "Tried to pickup Equip id " + itemid + " containing more than 1 quantity --> " + quantity);
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.showItemUnavailable());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.showItemUnavailable());
return false;
}
if (show) {
c.announce(MaplePacketCreator.getShowItemGain(itemid, item.getQuantity()));
c.announce(PacketCreator.getShowItemGain(itemid, item.getQuantity()));
}
return true;
}
@@ -429,9 +429,9 @@ public class MapleInventoryManipulator {
private static void announceModifyInventory(MapleClient c, Item item, boolean fromDrop, boolean allowZero) {
if (item.getQuantity() == 0 && !allowZero) {
c.announce(MaplePacketCreator.modifyInventory(fromDrop, Collections.singletonList(new ModifyInventory(3, item))));
c.announce(PacketCreator.modifyInventory(fromDrop, Collections.singletonList(new ModifyInventory(3, item))));
} else {
c.announce(MaplePacketCreator.modifyInventory(fromDrop, Collections.singletonList(new ModifyInventory(1, item))));
c.announce(PacketCreator.modifyInventory(fromDrop, Collections.singletonList(new ModifyInventory(1, item))));
}
}
@@ -498,7 +498,7 @@ public class MapleInventoryManipulator {
} else {
mods.add(new ModifyInventory(2, source, src));
}
c.announce(MaplePacketCreator.modifyInventory(true, mods));
c.announce(PacketCreator.modifyInventory(true, mods));
}
public static void equip(MapleClient c, short src, short dst) {
@@ -510,7 +510,7 @@ public class MapleInventoryManipulator {
Equip source = (Equip) eqpInv.getItem(src);
if (source == null || !ii.canWearEquipment(chr, source, dst)) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
} else if ((((source.getItemId() >= 1902000 && source.getItemId() <= 1902002) || source.getItemId() == 1912000) && chr.isCygnus()) || ((source.getItemId() >= 1902005 && source.getItemId() <= 1902007) || source.getItemId() == 1912005) && !chr.isCygnus()) {// Adventurer taming equipment
return;
@@ -527,8 +527,8 @@ public class MapleInventoryManipulator {
Item top = eqpdInv.getItem((short) -5);
if (top != null && ItemConstants.isOverall(top.getItemId())) {
if (eqpInv.isFull()) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.getShowInventoryFull());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.getShowInventoryFull());
return;
}
unequip(c, (byte) -5, eqpInv.getNextFreeSlot());
@@ -537,8 +537,8 @@ public class MapleInventoryManipulator {
final Item bottom = eqpdInv.getItem((short) -6);
if (bottom != null && ItemConstants.isOverall(source.getItemId())) {
if (eqpInv.isFull()) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.getShowInventoryFull());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.getShowInventoryFull());
return;
}
unequip(c, (byte) -6, eqpInv.getNextFreeSlot());
@@ -547,8 +547,8 @@ public class MapleInventoryManipulator {
Item weapon = eqpdInv.getItem((short) -11);
if (weapon != null && ii.isTwoHanded(weapon.getItemId())) {
if (eqpInv.isFull()) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.getShowInventoryFull());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.getShowInventoryFull());
return;
}
unequip(c, (byte) -11, eqpInv.getNextFreeSlot());
@@ -557,8 +557,8 @@ public class MapleInventoryManipulator {
Item shield = eqpdInv.getItem((short) -10);
if (shield != null && ii.isTwoHanded(source.getItemId())) {
if (eqpInv.isFull()) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(MaplePacketCreator.getShowInventoryFull());
c.announce(PacketCreator.getInventoryFull());
c.announce(PacketCreator.getShowInventoryFull());
return;
}
unequip(c, (byte) -10, eqpInv.getNextFreeSlot());
@@ -614,7 +614,7 @@ public class MapleInventoryManipulator {
}
mods.add(new ModifyInventory(2, source, src));
c.announce(MaplePacketCreator.modifyInventory(true, mods));
c.announce(PacketCreator.modifyInventory(true, mods));
chr.equipChanged();
}
@@ -632,7 +632,7 @@ public class MapleInventoryManipulator {
return;
}
if (target != null && src <= 0) {
c.announce(MaplePacketCreator.getInventoryFull());
c.announce(PacketCreator.getInventoryFull());
return;
}
@@ -656,7 +656,7 @@ public class MapleInventoryManipulator {
target.setPosition(src);
eqpdInv.addItemFromDB(target);
}
c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(2, source, src))));
c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(2, source, src))));
chr.equipChanged();
}
@@ -712,7 +712,7 @@ public class MapleInventoryManipulator {
Item target = source.copy();
target.setQuantity(quantity);
source.setQuantity((short) (source.getQuantity() - quantity));
c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, source))));
c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(1, source))));
if (ItemConstants.isNewYearCardEtc(itemId)) {
if(itemId == 4300000) {
@@ -742,7 +742,7 @@ public class MapleInventoryManipulator {
inv.removeSlot(src);
}
c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(3, source))));
c.announce(PacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(3, source))));
if (src < 0) {
chr.equipChanged();
} else if (ItemConstants.isNewYearCardEtc(itemId)) {
@@ -766,7 +766,7 @@ public class MapleInventoryManipulator {
if (itemId == chr.getItemEffect()) {
if (quantityNow <= 0) {
chr.setItemEffect(0);
map.broadcastMessage(MaplePacketCreator.itemEffect(chr.getId(), 0));
map.broadcastMessage(PacketCreator.itemEffect(chr.getId(), 0));
}
} else if (itemId == 5370000 || itemId == 5370001) {
if (source.getQuantity() <= 0) {

12
src/main/java/client/newyear/NewYearCardRecord.java
View File

@@ -23,7 +23,7 @@ import client.MapleCharacter;
import net.server.Server;
import server.TimerManager;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -257,7 +257,7 @@ public class NewYearCardRecord {
MapleCharacter target = server.getWorld(world).getPlayerStorage().getCharacterById(receiverId);
if(target != null && target.isLoggedinWorld()) {
target.announce(MaplePacketCreator.onNewYearCardRes(target, NewYearCardRecord.this, 0xC, 0));
target.announce(PacketCreator.onNewYearCardRes(target, NewYearCardRecord.this, 0xC, 0));
}
}, 1000 * 60 * 60); //1 Hour
}
@@ -308,12 +308,12 @@ public class NewYearCardRecord {
chr.removeNewYearRecord(nyc);
deleteNewYearCard(nyc.id);
chr.getMap().broadcastMessage(MaplePacketCreator.onNewYearCardRes(chr, nyc, 0xE, 0));
chr.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(chr, nyc, 0xE, 0));
MapleCharacter other = chr.getClient().getWorldServer().getPlayerStorage().getCharacterById(nyc.getReceiverId());
if(other != null && other.isLoggedinWorld()) {
other.removeNewYearRecord(nyc);
other.getMap().broadcastMessage(MaplePacketCreator.onNewYearCardRes(other, nyc, 0xE, 0));
other.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(other, nyc, 0xE, 0));
other.dropMessage(6, "[New Year] " + chr.getName() + " threw away the New Year card.");
}
@@ -326,12 +326,12 @@ public class NewYearCardRecord {
chr.removeNewYearRecord(nyc);
deleteNewYearCard(nyc.id);
chr.getMap().broadcastMessage(MaplePacketCreator.onNewYearCardRes(chr, nyc, 0xE, 0));
chr.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(chr, nyc, 0xE, 0));
MapleCharacter other = chr.getClient().getWorldServer().getPlayerStorage().getCharacterById(nyc.getSenderId());
if(other != null && other.isLoggedinWorld()) {
other.removeNewYearRecord(nyc);
other.getMap().broadcastMessage(MaplePacketCreator.onNewYearCardRes(other, nyc, 0xE, 0));
other.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(other, nyc, 0xE, 0));
other.dropMessage(6, "[New Year] " + chr.getName() + " threw away the New Year card.");
}

12
src/main/java/client/processor/action/BuybackProcessor.java
View File

@@ -19,10 +19,10 @@
*/
package client.processor.action; // thanks Alex for pointing out some package structures containing broad modules
import client.MapleClient;
import client.MapleCharacter;
import client.MapleClient;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
import tools.PacketCreator;
/**
*
@@ -74,11 +74,11 @@ public class BuybackProcessor {
chr.broadcastStance(chr.isFacingLeft() ? 5 : 4);
MapleMap map = chr.getMap();
map.broadcastMessage(MaplePacketCreator.playSound("Buyback/" + jobString));
map.broadcastMessage(MaplePacketCreator.earnTitleMessage(chr.getName() + " just bought back into the game!"));
map.broadcastMessage(PacketCreator.playSound("Buyback/" + jobString));
map.broadcastMessage(PacketCreator.earnTitleMessage(chr.getName() + " just bought back into the game!"));
chr.announce(MaplePacketCreator.showBuybackEffect());
map.broadcastMessage(chr, MaplePacketCreator.showForeignBuybackEffect(chr.getId()), false);
chr.announce(PacketCreator.showBuybackEffect());
map.broadcastMessage(chr, PacketCreator.showForeignBuybackEffect(chr.getId()), false);
}
}
}

65
src/main/java/client/processor/action/MakerProcessor.java
View File

@@ -19,27 +19,28 @@
*/
package client.processor.action;
import client.MapleClient;
import client.MapleCharacter;
import client.MapleClient;
import client.inventory.Equip;
import client.inventory.Item;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import config.YamlConfig;
import constants.inventory.ItemConstants;
import constants.game.GameConstants;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import constants.inventory.ItemConstants;
import server.MakerItemFactory;
import server.MakerItemFactory.MakerItemCreateEntry;
import server.MapleItemInformationProvider;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.data.input.SeekableLittleEndianAccessor;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
/**
*
* @author Ronan
@@ -64,8 +65,8 @@ public class MakerProcessor {
int fromLeftover = toCreate;
toCreate = ii.getMakerCrystalFromLeftover(toCreate);
if(toCreate == -1) {
c.announce(MaplePacketCreator.serverNotice(1, ii.getName(fromLeftover) + " is unavailable for Monster Crystal conversion."));
c.announce(MaplePacketCreator.makerEnableActions());
c.announce(PacketCreator.serverNotice(1, ii.getName(fromLeftover) + " is unavailable for Monster Crystal conversion."));
c.announce(PacketCreator.makerEnableActions());
return;
}
@@ -82,13 +83,13 @@ public class MakerProcessor {
if(p != null) {
recipe = MakerItemFactory.generateDisassemblyCrystalEntry(toDisassemble, p.getLeft(), p.getRight());
} else {
c.announce(MaplePacketCreator.serverNotice(1, ii.getName(toCreate) + " is unavailable for Monster Crystal disassembly."));
c.announce(MaplePacketCreator.makerEnableActions());
c.announce(PacketCreator.serverNotice(1, ii.getName(toCreate) + " is unavailable for Monster Crystal disassembly."));
c.announce(PacketCreator.makerEnableActions());
return;
}
} else {
c.announce(MaplePacketCreator.serverNotice(1, "An unknown error occurred when trying to apply that item for disassembly."));
c.announce(MaplePacketCreator.makerEnableActions());
c.announce(PacketCreator.serverNotice(1, "An unknown error occurred when trying to apply that item for disassembly."));
c.announce(PacketCreator.makerEnableActions());
return;
}
} else {
@@ -135,8 +136,8 @@ public class MakerProcessor {
if(!reagentids.isEmpty()) {
if(!removeOddMakerReagents(toCreate, reagentids)) {
c.announce(MaplePacketCreator.serverNotice(1, "You can only use WATK and MATK Strengthening Gems on weapon items."));
c.announce(MaplePacketCreator.makerEnableActions());
c.announce(PacketCreator.serverNotice(1, "You can only use WATK and MATK Strengthening Gems on weapon items."));
c.announce(PacketCreator.makerEnableActions());
return;
}
}
@@ -150,33 +151,33 @@ public class MakerProcessor {
switch(createStatus) {
case -1:// non-available for Maker itemid has been tried to forge
FilePrinter.printError(FilePrinter.EXPLOITS, "Player " + c.getPlayer().getName() + " tried to craft itemid " + toCreate + " using the Maker skill.");
c.announce(MaplePacketCreator.serverNotice(1, "The requested item could not be crafted on this operation."));
c.announce(MaplePacketCreator.makerEnableActions());
c.announce(PacketCreator.serverNotice(1, "The requested item could not be crafted on this operation."));
c.announce(PacketCreator.makerEnableActions());
break;
case 1: // no items
c.announce(MaplePacketCreator.serverNotice(1, "You don't have all required items in your inventory to make " + ii.getName(toCreate) + "."));
c.announce(MaplePacketCreator.makerEnableActions());
c.announce(PacketCreator.serverNotice(1, "You don't have all required items in your inventory to make " + ii.getName(toCreate) + "."));
c.announce(PacketCreator.makerEnableActions());
break;
case 2: // no meso
c.announce(MaplePacketCreator.serverNotice(1, "You don't have enough mesos (" + GameConstants.numberWithCommas(recipe.getCost()) + ") to complete this operation."));
c.announce(MaplePacketCreator.makerEnableActions());
c.announce(PacketCreator.serverNotice(1, "You don't have enough mesos (" + GameConstants.numberWithCommas(recipe.getCost()) + ") to complete this operation."));
c.announce(PacketCreator.makerEnableActions());
break;
case 3: // no req level
c.announce(MaplePacketCreator.serverNotice(1, "You don't have enough level to complete this operation."));
c.announce(MaplePacketCreator.makerEnableActions());
c.announce(PacketCreator.serverNotice(1, "You don't have enough level to complete this operation."));
c.announce(PacketCreator.makerEnableActions());
break;
case 4: // no req skill level
c.announce(MaplePacketCreator.serverNotice(1, "You don't have enough Maker level to complete this operation."));
c.announce(MaplePacketCreator.makerEnableActions());
c.announce(PacketCreator.serverNotice(1, "You don't have enough Maker level to complete this operation."));
c.announce(PacketCreator.makerEnableActions());
break;
case 5: // inventory full
c.announce(MaplePacketCreator.serverNotice(1, "Your inventory is full."));
c.announce(MaplePacketCreator.makerEnableActions());
c.announce(PacketCreator.serverNotice(1, "Your inventory is full."));
c.announce(PacketCreator.makerEnableActions());
break;
default:
@@ -213,15 +214,15 @@ public class MakerProcessor {
// thanks inhyuk for noticing missing MAKER_RESULT packets
if (type == 3) {
c.announce(MaplePacketCreator.makerResultCrystal(recipe.getGainItems().get(0).getLeft(), recipe.getReqItems().get(0).getLeft()));
c.announce(PacketCreator.makerResultCrystal(recipe.getGainItems().get(0).getLeft(), recipe.getReqItems().get(0).getLeft()));
} else if (type == 4) {
c.announce(MaplePacketCreator.makerResultDesynth(recipe.getReqItems().get(0).getLeft(), recipe.getCost(), recipe.getGainItems()));
c.announce(PacketCreator.makerResultDesynth(recipe.getReqItems().get(0).getLeft(), recipe.getCost(), recipe.getGainItems()));
} else {
c.announce(MaplePacketCreator.makerResult(makerSucceeded, recipe.getGainItems().get(0).getLeft(), recipe.getGainItems().get(0).getRight(), recipe.getCost(), recipe.getReqItems(), stimulantid, new LinkedList<>(reagentids.keySet())));
c.announce(PacketCreator.makerResult(makerSucceeded, recipe.getGainItems().get(0).getLeft(), recipe.getGainItems().get(0).getRight(), recipe.getCost(), recipe.getReqItems(), stimulantid, new LinkedList<>(reagentids.keySet())));
}
c.announce(MaplePacketCreator.showMakerEffect(makerSucceeded));
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.showForeignMakerEffect(c.getPlayer().getId(), makerSucceeded), false);
c.announce(PacketCreator.showMakerEffect(makerSucceeded));
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.showForeignMakerEffect(c.getPlayer().getId(), makerSucceeded), false);
if(toCreate == 4260003 && type == 3 && c.getPlayer().getQuestStatus(6033) == 1) {
c.getAbstractPlayerInteraction().setQuestProgress(6033, 1);

13
src/main/java/client/processor/action/PetAutopotProcessor.java
View File

@@ -28,10 +28,11 @@ import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import config.YamlConfig;
import java.util.List;
import server.MapleItemInformationProvider;
import server.MapleStatEffect;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.List;
/**
*
@@ -82,7 +83,7 @@ public class PetAutopotProcessor {
MapleClient c = this.c;
MapleCharacter chr = c.getPlayer();
if (!chr.isAlive()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -101,7 +102,7 @@ public class PetAutopotProcessor {
toUse = useInv.getItem(slot);
if (toUse != null) {
if (toUse.getItemId() != itemId) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -110,7 +111,7 @@ public class PetAutopotProcessor {
// from now on, toUse becomes the "cursor" for the current pot being used
if (toUse.getQuantity() <= 0) {
if (!cursorOnNextAvailablePot(chr)) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
}
@@ -178,7 +179,7 @@ public class PetAutopotProcessor {
}
}
chr.announce(MaplePacketCreator.enableActions());
chr.announce(PacketCreator.enableActions());
}
}

12
src/main/java/client/processor/action/SpawnPetProcessor.java
View File

@@ -29,7 +29,7 @@ import provider.MapleDataProvider;
import provider.MapleDataProviderFactory;
import provider.MapleDataTool;
import provider.wz.WZFiles;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.awt.*;
@@ -52,7 +52,7 @@ public class SpawnPetProcessor {
{
if (chr.haveItem(petid + 1)) {
chr.dropMessage(5, "You can't hatch your " + (petid == 5000028 ? "Dragon egg" : "Robo egg") + " if you already have a Baby " + (petid == 5000028 ? "Dragon." : "Robo."));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
} else {
int evolveid = MapleDataTool.getInt("info/evol1", dataRoot.getData("Pet/" + petid + ".img"));
@@ -64,7 +64,7 @@ public class SpawnPetProcessor {
MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, petid, (short) 1, false, false);
MapleInventoryManipulator.addById(c, evolveid, (short) 1, null, petId, expiration);
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
}
@@ -85,9 +85,9 @@ public class SpawnPetProcessor {
pet.setSummoned(true);
pet.saveToDb();
chr.addPet(pet);
chr.getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.showPet(c.getPlayer(), pet, false, false), true);
c.announce(MaplePacketCreator.petStatUpdate(c.getPlayer()));
c.announce(MaplePacketCreator.enableActions());
chr.getMap().broadcastMessage(c.getPlayer(), PacketCreator.showPet(c.getPlayer(), pet, false, false), true);
c.announce(PacketCreator.petStatUpdate(c.getPlayer()));
c.announce(PacketCreator.enableActions());
chr.commitExcludedItems();
chr.getClient().getWorldServer().registerPetHunger(chr, chr.getPetIndex(pet));

38
src/main/java/client/processor/npc/DueyProcessor.java
View File

@@ -40,7 +40,7 @@ import server.MapleItemInformationProvider;
import server.MapleTrade;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.sql.*;
@@ -117,7 +117,7 @@ public class DueyProcessor {
ps2.setInt(1, player.getId());
ps2.executeUpdate();
c.announce(MaplePacketCreator.sendDueyParcelReceived(rs.getString("SenderName"), rs.getInt("Type") == 1));
c.announce(PacketCreator.sendDueyParcelReceived(rs.getString("SenderName"), rs.getInt("Type") == 1));
}
}
}
@@ -305,21 +305,21 @@ public class DueyProcessor {
int recipientAccId = accIdCid.getLeft();
if (recipientAccId != -1) {
if (recipientAccId == c.getAccID()) {
c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_SAMEACC_ERROR.getCode()));
c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_SAMEACC_ERROR.getCode()));
return;
}
} else {
c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NAME_DOES_NOT_EXIST.getCode()));
c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NAME_DOES_NOT_EXIST.getCode()));
return;
}
} else {
c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NOT_ENOUGH_MESOS.getCode()));
c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NOT_ENOUGH_MESOS.getCode()));
return;
}
int recipientCid = accIdCid.getRight();
if (recipientCid == -1) {
c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NAME_DOES_NOT_EXIST.getCode()));
c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NAME_DOES_NOT_EXIST.getCode()));
return;
}
@@ -329,18 +329,18 @@ public class DueyProcessor {
int packageId = createPackage(sendMesos, sendMessage, c.getPlayer().getName(), recipientCid, quick);
if (packageId == -1) {
c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_ENABLE_ACTIONS.getCode()));
c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_ENABLE_ACTIONS.getCode()));
return;
}
c.getPlayer().gainMeso((int) -finalcost, false);
int res = addPackageItemFromInventory(packageId, c, invTypeId, itemPos, amount);
if (res == 0) {
c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_SUCCESSFULLY_SENT.getCode()));
c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_SUCCESSFULLY_SENT.getCode()));
} else if (res > 0) {
c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_ENABLE_ACTIONS.getCode()));
c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_ENABLE_ACTIONS.getCode()));
} else {
c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_INCORRECT_REQUEST.getCode()));
c.announce(PacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_INCORRECT_REQUEST.getCode()));
}
MapleClient rClient = null;
@@ -368,7 +368,7 @@ public class DueyProcessor {
if (c.tryacquireClient()) {
try {
removePackageFromDB(packageid);
c.announce(MaplePacketCreator.removeItemFromDuey(playerRemove, packageid));
c.announce(PacketCreator.removeItemFromDuey(playerRemove, packageid));
} finally {
c.releaseClient();
}
@@ -392,29 +392,29 @@ public class DueyProcessor {
}
if (dp == null) {
c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode()));
c.announce(PacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode()));
FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to receive package from duey with id " + packageId);
return;
}
if (dp.isDeliveringTime()) {
c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode()));
c.announce(PacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode()));
return;
}
Item dpItem = dp.getItem();
if (dpItem != null) {
if (!c.getPlayer().canHoldMeso(dp.getMesos())) {
c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode()));
c.announce(PacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode()));
return;
}
if (!MapleInventoryManipulator.checkSpace(c, dpItem.getItemId(), dpItem.getQuantity(), dpItem.getOwner())) {
int itemid = dpItem.getItemId();
if (MapleItemInformationProvider.getInstance().isPickupRestricted(itemid) && c.getPlayer().getInventory(ItemConstants.getInventoryType(itemid)).findById(itemid) != null) {
c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_RECEIVER_WITH_UNIQUE.getCode()));
c.announce(PacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_RECEIVER_WITH_UNIQUE.getCode()));
} else {
c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_NO_FREE_SLOTS.getCode()));
c.announce(PacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_NO_FREE_SLOTS.getCode()));
}
return;
@@ -440,15 +440,15 @@ public class DueyProcessor {
try {
long timeNow = System.currentTimeMillis();
if (timeNow - c.getPlayer().getNpcCooldown() < YamlConfig.config.server.BLOCK_NPC_RACE_CONDT) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
c.getPlayer().setNpcCooldown(timeNow);
if (quickDelivery) {
c.announce(MaplePacketCreator.sendDuey(0x1A, null));
c.announce(PacketCreator.sendDuey(0x1A, null));
} else {
c.announce(MaplePacketCreator.sendDuey(0x8, loadPackages(c.getPlayer())));
c.announce(PacketCreator.sendDuey(0x8, loadPackages(c.getPlayer())));
}
} finally {
c.releaseClient();

6
src/main/java/client/processor/npc/FredrickProcessor.java
View File

@@ -36,7 +36,7 @@ import server.MapleItemInformationProvider;
import server.maps.MapleHiredMerchant;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.sql.*;
@@ -275,7 +275,7 @@ public class FredrickProcessor {
byte response = canRetrieveFromFredrick(chr, items);
if (response != 0) {
chr.announce(MaplePacketCreator.fredrickMessage(response));
chr.announce(PacketCreator.fredrickMessage(response));
return;
}
@@ -294,7 +294,7 @@ public class FredrickProcessor {
FilePrinter.print(FilePrinter.FREDRICK + chr.getName() + ".txt", chr.getName() + " gained " + item.getQuantity() + " " + itemName + " (" + item.getItemId() + ")");
}
chr.announce(MaplePacketCreator.fredrickMessage((byte) 0x1E));
chr.announce(PacketCreator.fredrickMessage((byte) 0x1E));
removeFredrickLog(chr.getId());
} else {
chr.message("An unknown error has occured.");

34
src/main/java/client/processor/npc/StorageProcessor.java
View File

@@ -21,20 +21,20 @@
*/
package client.processor.npc;
import client.MapleClient;
import client.MapleCharacter;
import client.MapleClient;
import client.autoban.AutobanFactory;
import client.inventory.Item;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import client.inventory.manipulator.MapleKarmaManipulator;
import config.YamlConfig;
import constants.inventory.ItemConstants;
import client.inventory.manipulator.MapleInventoryManipulator;
import server.MapleItemInformationProvider;
import server.MapleStorage;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -52,7 +52,7 @@ public class StorageProcessor {
if (chr.getLevel() < 15){
chr.dropMessage(1, "You may only use the storage once you have reached level 15.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -71,13 +71,13 @@ public class StorageProcessor {
Item item = storage.getItem(slot);
if (item != null) {
if (ii.isPickupRestricted(item.getItemId()) && chr.haveItemWithId(item.getItemId(), true)) {
c.announce(MaplePacketCreator.getStorageError((byte) 0x0C));
c.announce(PacketCreator.getStorageError((byte) 0x0C));
return;
}
int takeoutFee = storage.getTakeOutFee();
if (chr.getMeso() < takeoutFee) {
c.announce(MaplePacketCreator.getStorageError((byte) 0x0B));
c.announce(PacketCreator.getStorageError((byte) 0x0B));
return;
} else {
chr.gainMeso(-takeoutFee, false);
@@ -95,11 +95,11 @@ public class StorageProcessor {
storage.sendTakenOut(c, item.getInventoryType());
} else {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
} else {
c.announce(MaplePacketCreator.getStorageError((byte) 0x0A));
c.announce(PacketCreator.getStorageError((byte) 0x0A));
}
}
} else if (mode == 5) { // store
@@ -115,17 +115,17 @@ public class StorageProcessor {
return;
}
if (quantity < 1) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if (storage.isFull()) {
c.announce(MaplePacketCreator.getStorageError((byte) 0x11));
c.announce(PacketCreator.getStorageError((byte) 0x11));
return;
}
int storeFee = storage.getStoreFee();
if (chr.getMeso() < storeFee) {
c.announce(MaplePacketCreator.getStorageError((byte) 0x0B));
c.announce(PacketCreator.getStorageError((byte) 0x0B));
} else {
Item item;
@@ -134,7 +134,7 @@ public class StorageProcessor {
item = inv.getItem(slot);
if (item != null && item.getItemId() == itemId && (item.getQuantity() >= quantity || ItemConstants.isRechargeable(itemId))) {
if (ItemConstants.isWeddingRing(itemId) || ItemConstants.isWeddingToken(itemId)) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -144,7 +144,7 @@ public class StorageProcessor {
MapleInventoryManipulator.removeFromSlot(c, invType, slot, quantity, false);
} else {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -168,7 +168,7 @@ public class StorageProcessor {
}
} else if (mode == 6) { // arrange items
if(YamlConfig.config.server.USE_STORAGE_ITEM_SORT) storage.arrangeItems(c);
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
} else if (mode == 7) { // meso
int meso = slea.readInt();
int storageMesos = storage.getMeso();
@@ -177,13 +177,13 @@ public class StorageProcessor {
if (meso < 0 && (storageMesos - meso) < 0) {
meso = Integer.MIN_VALUE + storageMesos;
if (meso < playerMesos) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
} else if (meso > 0 && (playerMesos + meso) < 0) {
meso = Integer.MAX_VALUE - playerMesos;
if (meso > storageMesos) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
}
@@ -193,7 +193,7 @@ public class StorageProcessor {
FilePrinter.print(FilePrinter.STORAGE + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + (meso > 0 ? " took out " : " stored ") + Math.abs(meso) + " mesos");
storage.sendMeso(c);
} else {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
} else if (mode == 8) {// close... unless the player decides to enter cash shop!

52
src/main/java/client/processor/stat/AssignAPProcessor.java
View File

@@ -30,7 +30,7 @@ import client.inventory.Item;
import client.inventory.MapleInventoryType;
import config.YamlConfig;
import constants.skills.*;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor;
@@ -329,11 +329,11 @@ public class AssignAPProcessor {
}
chr.assignStrDexIntLuk(statGain[0], statGain[1], statGain[3], statGain[2]);
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
//----------------------------------------------------------------------------------------
c.announce(MaplePacketCreator.serverNotice(1, "Better AP applications detected:\r\nSTR: +" + statGain[0] + "\r\nDEX: +" + statGain[1] + "\r\nINT: +" + statGain[3] + "\r\nLUK: +" + statGain[2]));
c.announce(PacketCreator.serverNotice(1, "Better AP applications detected:\r\nSTR: +" + statGain[0] + "\r\nDEX: +" + statGain[1] + "\r\nINT: +" + statGain[3] + "\r\nLUK: +" + statGain[2]));
} else {
if(slea.available() < 16) {
AutobanFactory.PACKET_EDIT.alert(chr, "Didn't send full packet for Auto Assign.");
@@ -353,7 +353,7 @@ public class AssignAPProcessor {
}
chr.assignStrDexIntLuk(statGain[0], statGain[1], statGain[3], statGain[2]);
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
}
} finally {
c.unlockClient();
@@ -426,48 +426,48 @@ public class AssignAPProcessor {
case 64: // str
if (player.getStr() < 5) {
player.message("You don't have the minimum STR required to swap.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
if (!player.assignStr(-1)) {
player.message("Couldn't execute AP reset operation.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
break;
case 128: // dex
if (player.getDex() < 5) {
player.message("You don't have the minimum DEX required to swap.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
if (!player.assignDex(-1)) {
player.message("Couldn't execute AP reset operation.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
break;
case 256: // int
if (player.getInt() < 5) {
player.message("You don't have the minimum INT required to swap.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
if (!player.assignInt(-1)) {
player.message("Couldn't execute AP reset operation.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
break;
case 512: // luk
if (player.getLuk() < 5) {
player.message("You don't have the minimum LUK required to swap.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
if (!player.assignLuk(-1)) {
player.message("Couldn't execute AP reset operation.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
break;
@@ -475,14 +475,14 @@ public class AssignAPProcessor {
if(YamlConfig.config.server.USE_ENFORCE_HPMP_SWAP) {
if (APTo != 8192) {
player.message("You can only swap HP ability points to MP.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
}
if (player.getHpMpApUsed() < 1) {
player.message("You don't have enough HPMP stat points to spend on AP Reset.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
@@ -490,7 +490,7 @@ public class AssignAPProcessor {
int level_ = player.getLevel();
if (hp < level_ * 14 + 148) {
player.message("You don't have the minimum HP pool required to swap.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
@@ -506,14 +506,14 @@ public class AssignAPProcessor {
if(YamlConfig.config.server.USE_ENFORCE_HPMP_SWAP) {
if (APTo != 2048) {
player.message("You can only swap MP ability points to HP.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
}
if (player.getHpMpApUsed() < 1) {
player.message("You don't have enough HPMP stat points to spend on AP Reset.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
@@ -534,7 +534,7 @@ public class AssignAPProcessor {
if (!canWash) {
player.message("You don't have the minimum MP pool required to swap.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
@@ -546,7 +546,7 @@ public class AssignAPProcessor {
}
break;
default:
c.announce(MaplePacketCreator.updatePlayerStats(MaplePacketCreator.EMPTY_STATUPDATE, true, player));
c.announce(PacketCreator.updatePlayerStats(PacketCreator.EMPTY_STATUPDATE, true, player));
return false;
}
@@ -571,47 +571,47 @@ public class AssignAPProcessor {
case 64:
if (!chr.assignStr(1)) {
chr.message("Couldn't execute AP assign operation.");
chr.announce(MaplePacketCreator.enableActions());
chr.announce(PacketCreator.enableActions());
return false;
}
break;
case 128: // Dex
if (!chr.assignDex(1)) {
chr.message("Couldn't execute AP assign operation.");
chr.announce(MaplePacketCreator.enableActions());
chr.announce(PacketCreator.enableActions());
return false;
}
break;
case 256: // Int
if (!chr.assignInt(1)) {
chr.message("Couldn't execute AP assign operation.");
chr.announce(MaplePacketCreator.enableActions());
chr.announce(PacketCreator.enableActions());
return false;
}
break;
case 512: // Luk
if (!chr.assignLuk(1)) {
chr.message("Couldn't execute AP assign operation.");
chr.announce(MaplePacketCreator.enableActions());
chr.announce(PacketCreator.enableActions());
return false;
}
break;
case 2048:
if (!chr.assignHP(calcHpChange(chr, usedAPReset), 1)) {
chr.message("Couldn't execute AP assign operation.");
chr.announce(MaplePacketCreator.enableActions());
chr.announce(PacketCreator.enableActions());
return false;
}
break;
case 8192:
if (!chr.assignMP(calcMpChange(chr, usedAPReset), 1)) {
chr.message("Couldn't execute AP assign operation.");
chr.announce(MaplePacketCreator.enableActions());
chr.announce(PacketCreator.enableActions());
return false;
}
break;
default:
chr.announce(MaplePacketCreator.updatePlayerStats(MaplePacketCreator.EMPTY_STATUPDATE, true, chr));
chr.announce(PacketCreator.updatePlayerStats(PacketCreator.EMPTY_STATUPDATE, true, chr));
return false;
}
return true;

6
src/main/java/client/processor/stat/AssignSPProcessor.java
View File

@@ -31,7 +31,7 @@ import client.autoban.AutobanFactory;
import constants.game.GameConstants;
import constants.skills.Aran;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
/**
*
@@ -41,7 +41,7 @@ public class AssignSPProcessor {
public static boolean canSPAssign(MapleClient c, int skillid) {
if (skillid == Aran.HIDDEN_FULL_DOUBLE || skillid == Aran.HIDDEN_FULL_TRIPLE || skillid == Aran.HIDDEN_OVER_DOUBLE || skillid == Aran.HIDDEN_OVER_TRIPLE) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
@@ -82,7 +82,7 @@ public class AssignSPProcessor {
if (!isBeginnerSkill) {
player.gainSp(-1, GameConstants.getSkillBook(skillid/10000), false);
} else {
player.announce(MaplePacketCreator.enableActions());
player.announce(PacketCreator.enableActions());
}
if (skill.getId() == Aran.FULL_SWING) {
player.changeSkillLevel(skill, (byte) (curLevel + 1), player.getMasterLevel(skill), player.getSkillExpiration(skill));

4
src/main/java/net/netty/ServerChannelInitializer.java
View File

@@ -18,7 +18,7 @@ import net.packet.logging.OutPacketLogger;
import net.server.coordinator.session.IpAddresses;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.net.InetSocketAddress;
import java.util.concurrent.atomic.AtomicLong;
@@ -54,7 +54,7 @@ public abstract class ServerChannelInitializer extends ChannelInitializer<Socket
}
private void writeInitialUnencryptedHelloPacket(SocketChannel socketChannel, InitializationVector sendIv, InitializationVector recvIv) {
socketChannel.writeAndFlush(Unpooled.wrappedBuffer(MaplePacketCreator.getHello(ServerConstants.VERSION, sendIv, recvIv)));
socketChannel.writeAndFlush(Unpooled.wrappedBuffer(PacketCreator.getHello(ServerConstants.VERSION, sendIv, recvIv)));
}
private void setUpHandlers(ChannelPipeline pipeline, InitializationVector sendIv, InitializationVector recvIv,

6
src/main/java/net/server/channel/Channel.java
View File

@@ -46,7 +46,7 @@ import server.events.gm.MapleEvent;
import server.expeditions.MapleExpedition;
import server.expeditions.MapleExpeditionType;
import server.maps.*;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.io.File;
@@ -263,7 +263,7 @@ public final class Channel {
public void addPlayer(MapleCharacter chr) {
players.addPlayer(chr);
chr.announce(MaplePacketCreator.serverMessage(serverMessage));
chr.announce(PacketCreator.serverMessage(serverMessage));
}
public String getServerMessage() {
@@ -440,7 +440,7 @@ public final class Channel {
public void setServerMessage(String message) {
this.serverMessage = message;
broadcastPacket(MaplePacketCreator.serverMessage(message));
broadcastPacket(PacketCreator.serverMessage(message));
getWorldServer().resetDisabledServerMessages();
}

18
src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java
View File

@@ -38,7 +38,7 @@ import server.maps.MapleMap;
import server.maps.MapleMapItem;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.Randomizer;
import tools.data.input.LittleEndianAccessor;
@@ -96,7 +96,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
theSkill = SkillFactory.getSkill(attack.skill); // thanks Conrad for noticing some Aran skills not consuming MP
attackEffect = attack.getAttackEffect(player, theSkill); //returns back the player's attack effect so we are gucci
if (attackEffect == null) {
player.announce(MaplePacketCreator.enableActions());
player.announce(PacketCreator.enableActions());
return;
}
@@ -127,7 +127,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
}
}
} else {
player.announce(MaplePacketCreator.enableActions());
player.announce(PacketCreator.enableActions());
}
}
@@ -168,7 +168,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
if (mapitem.isPickedUp()) {
return;
}
map.pickItemDrop(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 4, 0), mapitem);
map.pickItemDrop(PacketCreator.removeItemFromMap(mapitem.getObjectId(), 4, 0), mapitem);
} finally {
mapitem.unlockItem();
}
@@ -473,7 +473,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
}
} else {
if(attack.skill == Aran.BODY_PRESSURE) {
map.broadcastMessage(MaplePacketCreator.damageMonster(monster.getObjectId(), totDamageToOneMonster));
map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), totDamageToOneMonster));
}
map.damageMonster(player, monster, totDamageToOneMonster);
@@ -485,7 +485,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
if (ms.left == 145) {
MobSkill toUse = MobSkillFactory.getMobSkill(ms.left, ms.right);
player.addHP(-toUse.getX());
map.broadcastMessage(player, MaplePacketCreator.damagePlayer(0, monster.getId(), player.getId(), toUse.getX(), 0, 0, false, 0, true, monster.getObjectId(), 0, 0), true);
map.broadcastMessage(player, PacketCreator.damagePlayer(0, monster.getId(), player.getId(), toUse.getX(), 0, 0, false, 0, true, monster.getObjectId(), 0, 0), true);
}
}
}
@@ -496,7 +496,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
if (ms.left == 145) {
MobSkill toUse = MobSkillFactory.getMobSkill(ms.left, ms.right);
player.addHP(-toUse.getY());
map.broadcastMessage(player, MaplePacketCreator.damagePlayer(0, monster.getId(), player.getId(), toUse.getY(), 0, 0, false, 0, true, monster.getObjectId(), 0, 0), true);
map.broadcastMessage(player, PacketCreator.damagePlayer(0, monster.getId(), player.getId(), toUse.getY(), 0, 0, false, 0, true, monster.getObjectId(), 0, 0), true);
}
}
}
@@ -515,11 +515,11 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
if(animationTime > 0) { // be sure to only use LIMITED ATTACKS with animation time here
TimerManager.getInstance().schedule(() -> {
map.broadcastMessage(MaplePacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition());
map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition());
map.damageMonster(attacker, monster, damage);
}, animationTime);
} else {
map.broadcastMessage(MaplePacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition());
map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition());
map.damageMonster(attacker, monster, damage);
}
}

33
src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java
View File

@@ -21,16 +21,11 @@
*/
package net.server.channel.handlers;
import config.YamlConfig;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import client.MapleCharacter;
import client.MapleClient;
import client.MapleFamily;
import client.MapleFamilyEntry;
import config.YamlConfig;
import net.AbstractMaplePacketHandler;
import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteResult;
@@ -38,9 +33,13 @@ import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
/**
*
* @author Jay Estrella
@@ -68,7 +67,7 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler {
MapleFamilyEntry newEntry = new MapleFamilyEntry(inviter.getFamily(), chr.getId(), chr.getName(), chr.getLevel(), chr.getJob());
newEntry.setCharacter(chr);
if(!newEntry.setSenior(inviter.getFamilyEntry(), true)) {
inviter.announce(MaplePacketCreator.sendFamilyMessage(1, 0));
inviter.announce(PacketCreator.sendFamilyMessage(1, 0));
return;
} else {
// save
@@ -82,15 +81,15 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler {
if(inviter.getFamily().getTotalGenerations() + targetFamily.getTotalGenerations() <= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
targetEntry.join(inviter.getFamilyEntry());
} else {
inviter.announce(MaplePacketCreator.sendFamilyMessage(76, 0));
chr.announce(MaplePacketCreator.sendFamilyMessage(76, 0));
inviter.announce(PacketCreator.sendFamilyMessage(76, 0));
chr.announce(PacketCreator.sendFamilyMessage(76, 0));
return;
}
}
} else { // create new family
if(chr.getFamily() != null && inviter.getFamily() != null && chr.getFamily().getTotalGenerations() + inviter.getFamily().getTotalGenerations() >= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
inviter.announce(MaplePacketCreator.sendFamilyMessage(76, 0));
chr.announce(MaplePacketCreator.sendFamilyMessage(76, 0));
inviter.announce(PacketCreator.sendFamilyMessage(76, 0));
chr.announce(PacketCreator.sendFamilyMessage(76, 0));
return;
}
MapleFamily newFamily = new MapleFamily(-1, c.getWorld());
@@ -113,15 +112,15 @@ public final class AcceptFamilyHandler extends AbstractMaplePacketHandler {
chr.getFamilyEntry().join(inviterEntry);
}
}
c.getPlayer().getFamily().broadcast(MaplePacketCreator.sendFamilyJoinResponse(true, c.getPlayer().getName()), c.getPlayer().getId());
c.announce(MaplePacketCreator.getSeniorMessage(inviter.getName()));
c.announce(MaplePacketCreator.getFamilyInfo(chr.getFamilyEntry()));
c.getPlayer().getFamily().broadcast(PacketCreator.sendFamilyJoinResponse(true, c.getPlayer().getName()), c.getPlayer().getId());
c.announce(PacketCreator.getSeniorMessage(inviter.getName()));
c.announce(PacketCreator.getFamilyInfo(chr.getFamilyEntry()));
chr.getFamilyEntry().updateSeniorFamilyInfo(true);
} else {
inviter.announce(MaplePacketCreator.sendFamilyJoinResponse(false, c.getPlayer().getName()));
inviter.announce(PacketCreator.sendFamilyJoinResponse(false, c.getPlayer().getName()));
}
}
c.announce(MaplePacketCreator.sendFamilyMessage(0, 0));
c.announce(PacketCreator.sendFamilyMessage(0, 0));
}
private static void insertNewFamilyRecord(int characterID, int familyID, int seniorID, boolean updateChar) {

4
src/main/java/net/server/channel/handlers/AdminChatHandler.java
View File

@@ -4,7 +4,7 @@ import client.MapleClient;
import config.YamlConfig;
import net.AbstractMaplePacketHandler;
import tools.LogHelper;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -21,7 +21,7 @@ public class AdminChatHandler extends AbstractMaplePacketHandler {
byte mode = slea.readByte();
//not saving slides...
String message = slea.readMapleAsciiString();
byte[] packet = MaplePacketCreator.serverNotice(slea.readByte(), message);//maybe I should make a check for the slea.readByte()... but I just hope gm's don't fuck things up :)
byte[] packet = PacketCreator.serverNotice(slea.readByte(), message);//maybe I should make a check for the slea.readByte()... but I just hope gm's don't fuck things up :)
switch (mode) {
case 0:// /alertall, /noticeall, /slideall
c.getWorldServer().broadcastPacket(packet);

16
src/main/java/net/server/channel/handlers/AdminCommandHandler.java
View File

@@ -33,7 +33,7 @@ import server.life.MapleMonster;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import server.quest.MapleQuest;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor;
@@ -58,7 +58,7 @@ public final class AdminCommandHandler extends AbstractMaplePacketHandler {
c.getPlayer().getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition());
}
}
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
break;
case 0x01: { // /d (inv)
byte type = slea.readByte();
@@ -94,11 +94,11 @@ public final class AdminCommandHandler extends AbstractMaplePacketHandler {
target.block(type, duration, description);
target.sendPolice(duration, reason, 6000);
}
c.announce(MaplePacketCreator.getGMEffect(4, (byte) 0));
c.announce(PacketCreator.getGMEffect(4, (byte) 0));
} else if (MapleCharacter.ban(victim, reason, false)) {
c.announce(MaplePacketCreator.getGMEffect(4, (byte) 0));
c.announce(PacketCreator.getGMEffect(4, (byte) 0));
} else {
c.announce(MaplePacketCreator.getGMEffect(6, (byte) 1));
c.announce(PacketCreator.getGMEffect(6, (byte) 1));
}
break;
case 0x10: // /h, information added by vana -- <and tele mode f1> ... hide ofcourse
@@ -160,10 +160,10 @@ public final class AdminCommandHandler extends AbstractMaplePacketHandler {
String message = slea.readMapleAsciiString();
target = c.getChannelServer().getPlayerStorage().getCharacterByName(victim);
if (target != null) {
target.getClient().announce(MaplePacketCreator.serverNotice(1, message));
c.announce(MaplePacketCreator.getGMEffect(0x1E, (byte) 1));
target.getClient().announce(PacketCreator.serverNotice(1, message));
c.announce(PacketCreator.getGMEffect(0x1E, (byte) 1));
} else {
c.announce(MaplePacketCreator.getGMEffect(0x1E, (byte) 0));
c.announce(PacketCreator.getGMEffect(0x1E, (byte) 0));
}
break;
case 0x24:// /Artifact Ranking

32
src/main/java/net/server/channel/handlers/AllianceOperationHandler.java
View File

@@ -29,7 +29,7 @@ import net.server.Server;
import net.server.guild.MapleAlliance;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import tools.data.output.MaplePacketLittleEndianWriter;
@@ -45,7 +45,7 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler {
MapleCharacter chr = c.getPlayer();
if (chr.getGuild() == null) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -56,18 +56,18 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler {
byte b = slea.readByte();
if (alliance == null) {
if (b != 4) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
} else {
if (b == 4) {
chr.dropMessage(5, "Your guild is already registered on a guild alliance.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if (chr.getMGC().getAllianceRank() > 2 || !alliance.getGuilds().contains(chr.getGuildId())) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
}
@@ -131,9 +131,9 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler {
chr.saveGuildStatus();
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.addGuildToAlliance(alliance, guildid, c), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.updateAllianceInfo(alliance, c.getWorld()), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.addGuildToAlliance(alliance, guildid, c), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.updateAllianceInfo(alliance, c.getWorld()), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1);
guild.dropMessage("Your guild has joined the [" + alliance.getName() + "] union.");
break;
@@ -145,12 +145,12 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler {
return;
}
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.removeGuildFromAlliance(alliance, guildid, c.getWorld()), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.removeGuildFromAlliance(alliance, guildid, c.getWorld()), -1, -1);
Server.getInstance().removeGuildFromAlliance(alliance.getId(), guildid);
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.getGuildAlliances(alliance, c.getWorld()), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1);
Server.getInstance().guildMessage(guildid, MaplePacketCreator.disbandAlliance(allianceid));
Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.getGuildAlliances(alliance, c.getWorld()), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1);
Server.getInstance().guildMessage(guildid, PacketCreator.disbandAlliance(allianceid));
alliance.dropMessage("[" + Server.getInstance().getGuild(guildid).getName() + "] guild has been expelled from the union.");
break;
@@ -175,7 +175,7 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler {
ranks[i] = slea.readMapleAsciiString();
}
Server.getInstance().setAllianceRanks(alliance.getId(), ranks);
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.changeAllianceRankTitle(alliance.getId(), ranks), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.changeAllianceRankTitle(alliance.getId(), ranks), -1, -1);
break;
case 0x09: {
int int1 = slea.readInt();
@@ -190,7 +190,7 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler {
case 0x0A:
String notice = slea.readMapleAsciiString();
Server.getInstance().setAllianceNotice(alliance.getId(), notice);
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.allianceNotice(alliance.getId(), notice), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.allianceNotice(alliance.getId(), notice), -1, -1);
alliance.dropMessage(5, "* Alliance Notice : " + notice);
break;
@@ -210,7 +210,7 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler {
newLeader.getMGC().setAllianceRank(1);
newLeader.saveGuildStatus();
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.getGuildAlliances(alliance, newLeader.getWorld()), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.getGuildAlliances(alliance, newLeader.getWorld()), -1, -1);
alliance.dropMessage("'" + newLeader.getName() + "' has been appointed as the new head of this Alliance.");
}
@@ -221,7 +221,7 @@ public final class AllianceOperationHandler extends AbstractMaplePacketHandler {
chr.getMGC().setAllianceRank(newRank);
chr.saveGuildStatus();
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.getGuildAlliances(alliance, chr.getWorld()), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.getGuildAlliances(alliance, chr.getWorld()), -1, -1);
alliance.dropMessage("'" + chr.getName() + "' has been reassigned to '" + alliance.getRankTitle(newRank) + "' in this Alliance.");
}

6
src/main/java/net/server/channel/handlers/BBSOperationHandler.java
View File

@@ -25,7 +25,7 @@ import client.MapleCharacter;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.sql.Connection;
@@ -103,7 +103,7 @@ public final class BBSOperationHandler extends AbstractMaplePacketHandler {
ps.setInt(1, c.getPlayer().getGuildId());
try (ResultSet rs = ps.executeQuery()) {
c.announce(MaplePacketCreator.BBSThreadList(rs, start));
c.announce(PacketCreator.BBSThreadList(rs, start));
}
} catch (SQLException se) {
se.printStackTrace();
@@ -317,7 +317,7 @@ public final class BBSOperationHandler extends AbstractMaplePacketHandler {
ps2.setInt(1, !bIsThreadIdLocal ? threadid : threadRS.getInt("threadid"));
repliesRS = ps2.executeQuery();
}
client.announce(MaplePacketCreator.showThread(bIsThreadIdLocal ? threadid : threadRS.getInt("localthreadid"), threadRS, repliesRS));
client.announce(PacketCreator.showThread(bIsThreadIdLocal ? threadid : threadRS.getInt("localthreadid"), threadRS, repliesRS));
repliesRS.close();
}
if (ps2 != null) {

36
src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java
View File

@@ -21,23 +21,21 @@
*/
package net.server.channel.handlers;
import client.BuddyList;
import client.*;
import client.BuddyList.BuddyAddResult;
import client.BuddyList.BuddyOperation;
import static client.BuddyList.BuddyOperation.ADDED;
import client.BuddylistEntry;
import client.CharacterNameAndId;
import client.MapleCharacter;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import net.server.world.World;
import tools.DatabaseConnection;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import net.AbstractMaplePacketHandler;
import net.server.world.World;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import static client.BuddyList.BuddyOperation.ADDED;
public class BuddylistModifyHandler extends AbstractMaplePacketHandler {
private static class CharacterIdNameBuddyCapacity extends CharacterNameAndId {
@@ -56,7 +54,7 @@ public class BuddylistModifyHandler extends AbstractMaplePacketHandler {
private void nextPendingRequest(MapleClient c) {
CharacterNameAndId pendingBuddyRequest = c.getPlayer().getBuddylist().pollPendingRequest();
if (pendingBuddyRequest != null) {
c.announce(MaplePacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName()));
c.announce(PacketCreator.requestBuddylistAdd(pendingBuddyRequest.getId(), c.getPlayer().getId(), pendingBuddyRequest.getName()));
}
}
@@ -90,9 +88,9 @@ public class BuddylistModifyHandler extends AbstractMaplePacketHandler {
}
BuddylistEntry ble = buddylist.get(addName);
if (ble != null && !ble.isVisible() && group.equals(ble.getGroup())) {
c.announce(MaplePacketCreator.serverNotice(1, "You already have \"" + ble.getName() + "\" on your Buddylist"));
c.announce(PacketCreator.serverNotice(1, "You already have \"" + ble.getName() + "\" on your Buddylist"));
} else if (buddylist.isFull() && ble == null) {
c.announce(MaplePacketCreator.serverNotice(1, "Your buddylist is already full"));
c.announce(PacketCreator.serverNotice(1, "Your buddylist is already full"));
} else if (ble == null) {
try {
World world = c.getWorldServer();
@@ -137,7 +135,7 @@ public class BuddylistModifyHandler extends AbstractMaplePacketHandler {
}
}
if (buddyAddResult == BuddyAddResult.BUDDYLIST_FULL) {
c.announce(MaplePacketCreator.serverNotice(1, "\"" + addName + "\"'s Buddylist is full"));
c.announce(PacketCreator.serverNotice(1, "\"" + addName + "\"'s Buddylist is full"));
} else {
int displayChannel;
displayChannel = -1;
@@ -154,17 +152,17 @@ public class BuddylistModifyHandler extends AbstractMaplePacketHandler {
}
}
buddylist.put(new BuddylistEntry(charWithId.getName(), group, otherCid, displayChannel, true));
c.announce(MaplePacketCreator.updateBuddylist(buddylist.getBuddies()));
c.announce(PacketCreator.updateBuddylist(buddylist.getBuddies()));
}
} else {
c.announce(MaplePacketCreator.serverNotice(1, "A character called \"" + addName + "\" does not exist"));
c.announce(PacketCreator.serverNotice(1, "A character called \"" + addName + "\" does not exist"));
}
} catch (SQLException e) {
e.printStackTrace();
}
} else {
ble.changeGroup(group);
c.announce(MaplePacketCreator.updateBuddylist(buddylist.getBuddies()));
c.announce(PacketCreator.updateBuddylist(buddylist.getBuddies()));
}
} else if (mode == 2) { // accept buddy
int otherCid = slea.readInt();
@@ -189,7 +187,7 @@ public class BuddylistModifyHandler extends AbstractMaplePacketHandler {
}
if (otherName != null) {
buddylist.put(new BuddylistEntry(otherName, "Default Group", otherCid, channel, true));
c.announce(MaplePacketCreator.updateBuddylist(buddylist.getBuddies()));
c.announce(PacketCreator.updateBuddylist(buddylist.getBuddies()));
notifyRemoteChannel(c, channel, otherCid, ADDED);
}
} catch (SQLException e) {

13
src/main/java/net/server/channel/handlers/CancelBuffHandler.java
View File

@@ -23,17 +23,10 @@ package net.server.channel.handlers;
import client.MapleClient;
import client.SkillFactory;
import constants.skills.Bishop;
import constants.skills.Bowmaster;
import constants.skills.Corsair;
import constants.skills.Evan;
import constants.skills.FPArchMage;
import constants.skills.ILArchMage;
import constants.skills.Marksman;
import constants.skills.WindArcher;
import constants.skills.*;
import net.AbstractMaplePacketHandler;
import net.MaplePacketHandler;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class CancelBuffHandler extends AbstractMaplePacketHandler implements MaplePacketHandler {
@@ -52,7 +45,7 @@ public final class CancelBuffHandler extends AbstractMaplePacketHandler implemen
case WindArcher.HURRICANE:
case Evan.FIRE_BREATH:
case Evan.ICE_BREATH:
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.skillCancel(c.getPlayer(), sourceid), false);
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.skillCancel(c.getPlayer(), sourceid), false);
break;
default:

4
src/main/java/net/server/channel/handlers/CancelDebuffHandler.java
View File

@@ -35,8 +35,8 @@ public final class CancelDebuffHandler extends AbstractMaplePacketHandler {//TIP
List<MapleDisease> disease_ = new ArrayList<MapleDisease>();
disease_.add(disease);
diseases_.add(disease);
c.announce(MaplePacketCreator.cancelDebuff(disease_));
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.cancelForeignDebuff(c.getPlayer().getId(), disease_), false);
c.announce(PacketCreator.cancelDebuff(disease_));
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.cancelForeignDebuff(c.getPlayer().getId(), disease_), false);
}
for (MapleDisease disease : diseases_) {
c.getPlayer().removeDisease(disease);

111
src/main/java/net/server/channel/handlers/CashOperationHandler.java
View File

@@ -28,24 +28,25 @@ import client.inventory.Equip;
import client.inventory.Item;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import config.YamlConfig;
import constants.inventory.ItemConstants;
import java.sql.SQLException;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
import net.AbstractMaplePacketHandler;
import net.server.Server;
import server.CashShop;
import server.CashShop.CashItem;
import server.CashShop.CashItemFactory;
import client.inventory.manipulator.MapleInventoryManipulator;
import server.MapleItemInformationProvider;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.data.input.SeekableLittleEndianAccessor;
import java.sql.SQLException;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
public final class CashOperationHandler extends AbstractMaplePacketHandler {
@Override
@@ -54,7 +55,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
CashShop cs = chr.getCashShop();
if (!cs.isOpened()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -88,7 +89,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
Item item = cItem.toItem();
cs.gainCash(useNX, cItem, chr.getWorld()); // thanks Rohenn for noticing cash operations after item acquisition
cs.addToInventory(item);
c.announce(MaplePacketCreator.showBoughtCashItem(item, c.getAccID()));
c.announce(PacketCreator.showBoughtCashItem(item, c.getAccID()));
} else { // Package
cs.gainCash(useNX, cItem, chr.getWorld());
@@ -96,9 +97,9 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
for (Item item : cashPackage) {
cs.addToInventory(item);
}
c.announce(MaplePacketCreator.showBoughtCashPackage(cashPackage, c.getAccID()));
c.announce(PacketCreator.showBoughtCashPackage(cashPackage, c.getAccID()));
}
c.announce(MaplePacketCreator.showCash(chr));
c.announce(PacketCreator.showCash(chr));
} else if (action == 0x04) {//TODO check for gender
int birthday = slea.readInt();
CashItem cItem = CashItemFactory.getItem(slea.readInt());
@@ -109,19 +110,19 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
return;
}
if (!checkBirthday(c, birthday)) {
c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC4));
c.announce(PacketCreator.showCashShopMessage((byte) 0xC4));
return;
} else if (recipient == null) {
c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xA9));
c.announce(PacketCreator.showCashShopMessage((byte) 0xA9));
return;
} else if (recipient.get("accountid").equals(String.valueOf(c.getAccID()))) {
c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xA8));
c.announce(PacketCreator.showCashShopMessage((byte) 0xA8));
return;
}
cs.gainCash(4, cItem, chr.getWorld());
cs.gift(Integer.parseInt(recipient.get("id")), chr.getName(), message, cItem.getSN());
c.announce(MaplePacketCreator.showGiftSucceed(recipient.get("name"), cItem));
c.announce(MaplePacketCreator.showCash(chr));
c.announce(PacketCreator.showGiftSucceed(recipient.get("name"), cItem));
c.announce(PacketCreator.showCash(chr));
try {
chr.sendNote(recipient.get("name"), chr.getName() + " has sent you a gift! Go check out the Cash Shop.", (byte) 0); //fame or not
} catch (SQLException ex) {
@@ -138,7 +139,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
cs.addToWishList(sn);
}
}
c.announce(MaplePacketCreator.showWishList(chr, true));
c.announce(PacketCreator.showWishList(chr, true));
} else if (action == 0x06) { // Increase Inventory Slots
slea.skip(1);
int cash = slea.readInt();
@@ -156,8 +157,8 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
}
cs.gainCash(cash, -4000);
if (chr.gainSlots(type, qty, false)) {
c.announce(MaplePacketCreator.showBoughtInventorySlots(type, chr.getSlots(type)));
c.announce(MaplePacketCreator.showCash(chr));
c.announce(PacketCreator.showBoughtInventorySlots(type, chr.getSlots(type)));
c.announce(PacketCreator.showCash(chr));
} else {
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots of type " + type + " for player " + MapleCharacter.makeMapleReadable(chr.getName()));
}
@@ -175,8 +176,8 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
}
cs.gainCash(cash, cItem, chr.getWorld());
if (chr.gainSlots(type, qty, false)) {
c.announce(MaplePacketCreator.showBoughtInventorySlots(type, chr.getSlots(type)));
c.announce(MaplePacketCreator.showCash(chr));
c.announce(PacketCreator.showBoughtInventorySlots(type, chr.getSlots(type)));
c.announce(PacketCreator.showCash(chr));
} else {
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots of type " + type + " for player " + MapleCharacter.makeMapleReadable(chr.getName()));
}
@@ -200,8 +201,8 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
FilePrinter.print(FilePrinter.STORAGE + c.getAccountName() + ".txt", c.getPlayer().getName() + " bought " + qty + " slots to their account storage.");
chr.setUsedStorage();
c.announce(MaplePacketCreator.showBoughtStorageSlots(chr.getStorage().getSlots()));
c.announce(MaplePacketCreator.showCash(chr));
c.announce(PacketCreator.showBoughtStorageSlots(chr.getStorage().getSlots()));
c.announce(PacketCreator.showCash(chr));
} else {
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots to " + MapleCharacter.makeMapleReadable(chr.getName()) + "'s account.");
}
@@ -222,8 +223,8 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
FilePrinter.print(FilePrinter.STORAGE + c.getAccountName() + ".txt", c.getPlayer().getName() + " bought " + qty + " slots to their account storage.");
chr.setUsedStorage();
c.announce(MaplePacketCreator.showBoughtStorageSlots(chr.getStorage().getSlots()));
c.announce(MaplePacketCreator.showCash(chr));
c.announce(PacketCreator.showBoughtStorageSlots(chr.getStorage().getSlots()));
c.announce(PacketCreator.showCash(chr));
} else {
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add " + qty + " slots to " + MapleCharacter.makeMapleReadable(chr.getName()) + "'s account.");
}
@@ -244,8 +245,8 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
}
cs.gainCash(cash, cItem, chr.getWorld());
if (c.gainCharacterSlot()) {
c.announce(MaplePacketCreator.showBoughtCharacterSlot(c.getCharacterSlots()));
c.announce(MaplePacketCreator.showCash(chr));
c.announce(PacketCreator.showBoughtCharacterSlot(c.getCharacterSlots()));
c.announce(PacketCreator.showCash(chr));
} else {
FilePrinter.printError(FilePrinter.CASHITEM_BOUGHT, "Could not add a character slot to " + MapleCharacter.makeMapleReadable(chr.getName()) + "'s account.");
c.enableCSActions();
@@ -259,7 +260,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
}
if (chr.getInventory(item.getInventoryType()).addItem(item) != -1) {
cs.removeFromInventory(item);
c.announce(MaplePacketCreator.takeFromCashInventory(item));
c.announce(PacketCreator.takeFromCashInventory(item));
if(item instanceof Equip) {
Equip equip = (Equip) item;
@@ -285,17 +286,17 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
c.enableCSActions();
return;
} else if (c.getPlayer().getPetIndex(item.getPetId()) > -1) {
chr.getClient().announce(MaplePacketCreator.serverNotice(1, "You cannot put the pet you currently equip into the Cash Shop inventory."));
chr.getClient().announce(PacketCreator.serverNotice(1, "You cannot put the pet you currently equip into the Cash Shop inventory."));
c.enableCSActions();
return;
} else if (ItemConstants.isWeddingRing(item.getItemId()) || ItemConstants.isWeddingToken(item.getItemId())) {
chr.getClient().announce(MaplePacketCreator.serverNotice(1, "You cannot put relationship items into the Cash Shop inventory."));
chr.getClient().announce(PacketCreator.serverNotice(1, "You cannot put relationship items into the Cash Shop inventory."));
c.enableCSActions();
return;
}
cs.addToInventory(item);
mi.removeSlot(item.getPosition());
c.announce(MaplePacketCreator.putIntoCashInventory(item, c.getAccID()));
c.announce(PacketCreator.putIntoCashInventory(item, c.getAccID()));
} else if (action == 0x1D) { //crush ring (action 28)
int birthday = slea.readInt();
if (checkBirthday(c, birthday)) {
@@ -306,7 +307,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
CashItem itemRing = CashItemFactory.getItem(SN);
MapleCharacter partner = c.getChannelServer().getPlayerStorage().getCharacterByName(recipientName);
if (partner == null) {
chr.getClient().announce(MaplePacketCreator.serverNotice(1, "The partner you specified cannot be found.\r\nPlease make sure your partner is online and in the same channel."));
chr.getClient().announce(PacketCreator.serverNotice(1, "The partner you specified cannot be found.\r\nPlease make sure your partner is online and in the same channel."));
} else {
/* if (partner.getGender() == chr.getGender()) {
@@ -320,7 +321,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
Pair<Integer, Integer> rings = MapleRing.createRing(itemRing.getItemId(), chr, partner);
eqp.setRingId(rings.getLeft());
cs.addToInventory(eqp);
c.announce(MaplePacketCreator.showBoughtCashItem(eqp, c.getAccID()));
c.announce(PacketCreator.showBoughtCashItem(eqp, c.getAccID()));
cs.gainCash(toCharge, itemRing, chr.getWorld());
cs.gift(partner.getId(), chr.getName(), text, eqp.getSN(), rings.getRight());
chr.addCrushRing(MapleRing.loadFromDb(rings.getLeft()));
@@ -333,27 +334,27 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
}
}
} else {
c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC4));
c.announce(PacketCreator.showCashShopMessage((byte) 0xC4));
}
c.announce(MaplePacketCreator.showCash(c.getPlayer()));
c.announce(PacketCreator.showCash(c.getPlayer()));
} else if (action == 0x20) {
int serialNumber = slea.readInt(); // thanks GabrielSin for detecting a potential exploit with 1 meso cash items.
if (serialNumber / 10000000 != 8) {
c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC0));
c.announce(PacketCreator.showCashShopMessage((byte) 0xC0));
return;
}
CashItem item = CashItemFactory.getItem(serialNumber);
if (item == null || !item.isOnSale()) {
c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC0));
c.announce(PacketCreator.showCashShopMessage((byte) 0xC0));
return;
}
int itemId = item.getItemId();
int itemPrice = item.getPrice();
if (itemPrice <= 0) {
c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC0));
c.announce(PacketCreator.showCashShopMessage((byte) 0xC0));
return;
}
@@ -361,10 +362,10 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
if (chr.canHold(itemId)) {
chr.gainMeso(-itemPrice, false);
MapleInventoryManipulator.addById(c, itemId, (short) 1, "", -1);
c.announce(MaplePacketCreator.showBoughtQuestItem(itemId));
c.announce(PacketCreator.showBoughtQuestItem(itemId));
}
}
c.announce(MaplePacketCreator.showCash(c.getPlayer()));
c.announce(PacketCreator.showCash(c.getPlayer()));
} else if (action == 0x23) { //Friendship :3
int birthday = slea.readInt();
if (checkBirthday(c, birthday)) {
@@ -378,7 +379,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
slea.readByte();
MapleCharacter partner = c.getChannelServer().getPlayerStorage().getCharacterByName(sentTo);
if (partner == null) {
c.announce(MaplePacketCreator.showCashShopMessage((byte)0xBE));
c.announce(PacketCreator.showCashShopMessage((byte)0xBE));
} else {
// Need to check to make sure its actually an equip and the right SN...
if(itemRing.toItem() instanceof Equip) {
@@ -386,7 +387,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
Pair<Integer, Integer> rings = MapleRing.createRing(itemRing.getItemId(), chr, partner);
eqp.setRingId(rings.getLeft());
cs.addToInventory(eqp);
c.announce(MaplePacketCreator.showBoughtCashRing(eqp, partner.getName(), c.getAccID()));
c.announce(PacketCreator.showBoughtCashRing(eqp, partner.getName(), c.getAccID()));
cs.gainCash(payment, -itemRing.getPrice());
cs.gift(partner.getId(), chr.getName(), text, eqp.getSN(), rings.getRight());
chr.addFriendshipRing(MapleRing.loadFromDb(rings.getLeft()));
@@ -399,14 +400,14 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
}
}
} else {
c.announce(MaplePacketCreator.showCashShopMessage((byte) 0xC4));
c.announce(PacketCreator.showCashShopMessage((byte) 0xC4));
}
c.announce(MaplePacketCreator.showCash(c.getPlayer()));
c.announce(PacketCreator.showCash(c.getPlayer()));
} else if (action == 0x2E) { //name change
CashItem cItem = CashItemFactory.getItem(slea.readInt());
if (cItem == null || !canBuy(chr, cItem, cs.getCash(4))) {
c.announce(MaplePacketCreator.showCashShopMessage((byte)0));
c.announce(PacketCreator.showCashShopMessage((byte)0));
c.enableCSActions();
return;
}
@@ -414,28 +415,28 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
slea.readMapleAsciiString(); //old name
String newName = slea.readMapleAsciiString();
if(!MapleCharacter.canCreateChar(newName) || chr.getLevel() < 10) { //(longest ban duration isn't tracked currently)
c.announce(MaplePacketCreator.showCashShopMessage((byte)0));
c.announce(PacketCreator.showCashShopMessage((byte)0));
c.enableCSActions();
return;
} else if(c.getTempBanCalendar() != null && c.getTempBanCalendar().getTimeInMillis() + (30*24*60*60*1000) > Calendar.getInstance().getTimeInMillis()) {
c.announce(MaplePacketCreator.showCashShopMessage((byte)0));
c.announce(PacketCreator.showCashShopMessage((byte)0));
c.enableCSActions();
return;
}
if(chr.registerNameChange(newName)) { //success
Item item = cItem.toItem();
c.announce(MaplePacketCreator.showNameChangeSuccess(item, c.getAccID()));
c.announce(PacketCreator.showNameChangeSuccess(item, c.getAccID()));
cs.gainCash(4, cItem, chr.getWorld());
cs.addToInventory(item);
} else {
c.announce(MaplePacketCreator.showCashShopMessage((byte)0));
c.announce(PacketCreator.showCashShopMessage((byte)0));
}
}
c.enableCSActions();
} else if(action == 0x31) { //world transfer
CashItem cItem = CashItemFactory.getItem(slea.readInt());
if (cItem == null || !canBuy(chr, cItem, cs.getCash(4))) {
c.announce(MaplePacketCreator.showCashShopMessage((byte)0));
c.announce(PacketCreator.showCashShopMessage((byte)0));
c.enableCSActions();
return;
}
@@ -444,21 +445,21 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
int worldTransferError = chr.checkWorldTransferEligibility();
if(worldTransferError != 0 || newWorldSelection >= Server.getInstance().getWorldsSize() || Server.getInstance().getWorldsSize() <= 1) {
c.announce(MaplePacketCreator.showCashShopMessage((byte)0));
c.announce(PacketCreator.showCashShopMessage((byte)0));
return;
} else if(newWorldSelection == c.getWorld()) {
c.announce(MaplePacketCreator.showCashShopMessage((byte)0xDC));
c.announce(PacketCreator.showCashShopMessage((byte)0xDC));
return;
} else if(c.getAvailableCharacterWorldSlots(newWorldSelection) < 1 || Server.getInstance().getAccountWorldCharacterCount(c.getAccID(), newWorldSelection) >= 3) {
c.announce(MaplePacketCreator.showCashShopMessage((byte)0xDF));
c.announce(PacketCreator.showCashShopMessage((byte)0xDF));
return;
} else if(chr.registerWorldTransfer(newWorldSelection)) {
Item item = cItem.toItem();
c.announce(MaplePacketCreator.showWorldTransferSuccess(item, c.getAccID()));
c.announce(PacketCreator.showWorldTransferSuccess(item, c.getAccID()));
cs.gainCash(4, cItem, chr.getWorld());
cs.addToInventory(item);
} else {
c.announce(MaplePacketCreator.showCashShopMessage((byte)0));
c.announce(PacketCreator.showCashShopMessage((byte)0));
}
}
c.enableCSActions();
@@ -469,7 +470,7 @@ public final class CashOperationHandler extends AbstractMaplePacketHandler {
c.releaseClient();
}
} else {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
}
}

8
src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java
View File

@@ -23,9 +23,9 @@ import client.MapleClient;
import client.inventory.Item;
import net.AbstractMaplePacketHandler;
import server.CashShop;
import tools.data.input.SeekableLittleEndianAccessor;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.data.input.SeekableLittleEndianAccessor;
/**
*
@@ -41,9 +41,9 @@ public class CashShopSurpriseHandler extends AbstractMaplePacketHandler {
if(cssResult != null) {
Item cssItem = cssResult.getLeft(), cssBox = cssResult.getRight();
c.announce(MaplePacketCreator.onCashGachaponOpenSuccess(c.getAccID(), cssBox.getSN(), cssBox.getQuantity(), cssItem, cssItem.getItemId(), cssItem.getQuantity(), true));
c.announce(PacketCreator.onCashGachaponOpenSuccess(c.getAccID(), cssBox.getSN(), cssBox.getQuantity(), cssItem, cssItem.getItemId(), cssItem.getQuantity(), true));
} else {
c.announce(MaplePacketCreator.onCashItemGachaponOpenFailed());
c.announce(PacketCreator.onCashItemGachaponOpenFailed());
}
}
}

20
src/main/java/net/server/channel/handlers/ChangeMapHandler.java
View File

@@ -30,7 +30,7 @@ import server.MapleTrade;
import server.maps.MapleMap;
import server.maps.MaplePortal;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.awt.*;
@@ -49,7 +49,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
FilePrinter.printError(FilePrinter.PORTAL_STUCK + chr.getName() + ".txt", "Player " + chr.getName() + " got stuck when changing maps. Timestamp: " + Calendar.getInstance().getTime().toString() + " Last visited mapids: " + chr.getLastVisitedMapids());
}
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if (chr.getTrade() != null) {
@@ -65,7 +65,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
chr.setSessionTransitionState();
try {
c.announce(MaplePacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
c.announce(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
} catch (UnknownHostException ex) {
ex.printStackTrace();
}
@@ -95,7 +95,7 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
// thanks lucasziron (lziron) for showing revivePlayer() triggering by Wheel
MapleInventoryManipulator.removeById(c, MapleInventoryType.CASH, 5510000, 1, true, false);
chr.announce(MaplePacketCreator.showWheelsLeft(chr.getItemQuantity(5510000, false)));
chr.announce(PacketCreator.showWheelsLeft(chr.getItemQuantity(5510000, false)));
chr.updateHp(50);
chr.changeMap(map, map.findClosestPlayerSpawnpoint(chr.getPosition()));
@@ -121,8 +121,8 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
}
} else if (divi == 20100) {
if (targetid == 104000000) {
c.announce(MaplePacketCreator.lockUI(false));
c.announce(MaplePacketCreator.disableUI(false));
c.announce(PacketCreator.lockUI(false));
c.announce(PacketCreator.disableUI(false));
warp = true;
}
} else if (divi == 9130401) { // Only allow warp if player is already in Intro map, or else = hack
@@ -151,8 +151,8 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
}
if (portal != null && !portal.getPortalStatus()) {
c.announce(MaplePacketCreator.blockedMessage(1));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.blockedMessage(1));
c.announce(PacketCreator.enableActions());
return;
}
@@ -164,13 +164,13 @@ public final class ChangeMapHandler extends AbstractMaplePacketHandler {
if (portal != null) {
if (portal.getPosition().distanceSq(chr.getPosition()) > 400000) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
portal.enterPortal(c);
} else {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
}
} catch (Exception e) {
e.printStackTrace();

8
src/main/java/net/server/channel/handlers/ChangeMapSpecialHandler.java
View File

@@ -23,10 +23,10 @@ package net.server.channel.handlers;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import server.maps.MaplePortal;
import server.MapleTrade;
import server.MapleTrade.TradeResult;
import tools.MaplePacketCreator;
import server.maps.MaplePortal;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class ChangeMapSpecialHandler extends AbstractMaplePacketHandler {
@@ -37,11 +37,11 @@ public final class ChangeMapSpecialHandler extends AbstractMaplePacketHandler {
slea.readShort();
MaplePortal portal = c.getPlayer().getMap().getPortal(startwp);
if (portal == null || c.getPlayer().portalDelay() > currentServerTime() || c.getPlayer().getBlockedPortals().contains(portal.getScriptName())) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if (c.getPlayer().isChangingMaps() || c.getPlayer().isBanned()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if (c.getPlayer().getTrade() != null) {

4
src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java
View File

@@ -25,7 +25,7 @@ import client.MapleCharacter;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import server.maps.MapleMapObject;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class CharInfoRequestHandler extends AbstractMaplePacketHandler {
@@ -42,7 +42,7 @@ public final class CharInfoRequestHandler extends AbstractMaplePacketHandler {
if(c.getPlayer().getId() != player.getId()) {
player.exportExcludedItems(c);
}
c.announce(MaplePacketCreator.charInfo(player));
c.announce(PacketCreator.charInfo(player));
}
}
}

4
src/main/java/net/server/channel/handlers/CloseChalkboardHandler.java
View File

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -35,6 +35,6 @@ public final class CloseChalkboardHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
c.getPlayer().setChalkboard(null);
c.getPlayer().getMap().broadcastMessage(MaplePacketCreator.useChalkboard(c.getPlayer(), true));
c.getPlayer().getMap().broadcastMessage(PacketCreator.useChalkboard(c.getPlayer(), true));
}
}

16
src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java
View File

@@ -26,7 +26,7 @@ import config.YamlConfig;
import constants.game.GameConstants;
import constants.skills.*;
import server.MapleStatEffect;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.data.input.SeekableLittleEndianAccessor;
@@ -59,10 +59,10 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
return;
if (GameConstants.isDojo(chr.getMap().getId()) && attack.numAttacked > 0) {
chr.setDojoEnergy(chr.getDojoEnergy() + YamlConfig.config.server.DOJO_ENERGY_ATK);
c.announce(MaplePacketCreator.getEnergy("energy", chr.getDojoEnergy()));
c.announce(PacketCreator.getEnergy("energy", chr.getDojoEnergy()));
}
chr.getMap().broadcastMessage(chr, MaplePacketCreator.closeRangeAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, attack.allDamage, attack.speed, attack.direction, attack.display), false, true);
chr.getMap().broadcastMessage(chr, PacketCreator.closeRangeAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, attack.allDamage, attack.speed, attack.direction, attack.display), false, true);
int numFinisherOrbs = 0;
Integer comboBuff = chr.getBuffedValue(MapleBuffStat.COMBO);
if (GameConstants.isFinisherSkill(attack.skill)) {
@@ -104,8 +104,8 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.COMBO, neworbcount));
chr.setBuffedValue(MapleBuffStat.COMBO, neworbcount);
duration -= (int) (currentServerTime() - chr.getBuffedStarttime(MapleBuffStat.COMBO));
c.announce(MaplePacketCreator.giveBuff(oid, duration, stat));
chr.getMap().broadcastMessage(chr, MaplePacketCreator.giveForeignBuff(chr.getId(), stat), false);
c.announce(PacketCreator.giveBuff(oid, duration, stat));
chr.getMap().broadcastMessage(chr, PacketCreator.giveForeignBuff(chr.getId(), stat), false);
}
}
} else if (chr.getSkillLevel(chr.isCygnus() ? SkillFactory.getSkill(15100004) : SkillFactory.getSkill(5110001)) > 0 && (chr.getJob().isA(MapleJob.MARAUDER) || chr.getJob().isA(MapleJob.THUNDERBREAKER2))) {
@@ -146,8 +146,8 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
}
chr.setDojoEnergy(0);
c.announce(MaplePacketCreator.getEnergy("energy", chr.getDojoEnergy()));
c.announce(MaplePacketCreator.serverNotice(5, "As you used the secret skill, your energy bar has been reset."));
c.announce(PacketCreator.getEnergy("energy", chr.getDojoEnergy()));
c.announce(PacketCreator.serverNotice(5, "As you used the secret skill, your energy bar has been reset."));
} else if (attack.skill > 0) {
Skill skill = SkillFactory.getSkill(attack.skill);
MapleStatEffect effect_ = skill.getEffect(chr.getSkillLevel(skill));
@@ -155,7 +155,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
if (chr.skillIsCooling(attack.skill)) {
return;
} else {
c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));
c.announce(PacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));
chr.addCooldown(attack.skill, currentServerTime(), effect_.getCooldown() * 1000);
}
}

16
src/main/java/net/server/channel/handlers/CoconutHandler.java
View File

@@ -27,7 +27,7 @@ import net.AbstractMaplePacketHandler;
import server.events.gm.MapleCoconut;
import server.events.gm.MapleCoconuts;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -57,29 +57,29 @@ public final class CoconutHandler extends AbstractMaplePacketHandler {
if (Math.random() < 0.01 && event.getStopped() > 0) {
nut.setHittable(false);
event.stopCoconut();
map.broadcastMessage(MaplePacketCreator.hitCoconut(false, id, 1));
map.broadcastMessage(PacketCreator.hitCoconut(false, id, 1));
return;
}
nut.setHittable(false); // for sure :)
nut.resetHits(); // For next event (without restarts)
if (Math.random() < 0.05 && event.getBombings() > 0) {
map.broadcastMessage(MaplePacketCreator.hitCoconut(false, id, 2));
map.broadcastMessage(PacketCreator.hitCoconut(false, id, 2));
event.bombCoconut();
} else if (event.getFalling() > 0) {
map.broadcastMessage(MaplePacketCreator.hitCoconut(false, id, 3));
map.broadcastMessage(PacketCreator.hitCoconut(false, id, 3));
event.fallCoconut();
if (c.getPlayer().getTeam() == 0) {
event.addMapleScore();
map.broadcastMessage(MaplePacketCreator.serverNotice(5, c.getPlayer().getName() + " of Team Maple knocks down a coconut."));
map.broadcastMessage(PacketCreator.serverNotice(5, c.getPlayer().getName() + " of Team Maple knocks down a coconut."));
} else {
event.addStoryScore();
map.broadcastMessage(MaplePacketCreator.serverNotice(5, c.getPlayer().getName() + " of Team Story knocks down a coconut."));
map.broadcastMessage(PacketCreator.serverNotice(5, c.getPlayer().getName() + " of Team Story knocks down a coconut."));
}
map.broadcastMessage(MaplePacketCreator.coconutScore(event.getMapleScore(), event.getStoryScore()));
map.broadcastMessage(PacketCreator.coconutScore(event.getMapleScore(), event.getStoryScore()));
}
} else {
nut.hit();
map.broadcastMessage(MaplePacketCreator.hitCoconut(false, id, 1));
map.broadcastMessage(PacketCreator.hitCoconut(false, id, 1));
}
}
}

8
src/main/java/net/server/channel/handlers/CouponCodeHandler.java
View File

@@ -33,7 +33,7 @@ import server.CashShop;
import server.MapleItemInformationProvider;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.data.input.SeekableLittleEndianAccessor;
@@ -188,7 +188,7 @@ public final class CouponCodeHandler extends AbstractMaplePacketHandler {
Pair<Integer, List<Pair<Integer, Pair<Integer, Integer>>>> codeRes = getNXCodeResult(c.getPlayer(), code.toUpperCase());
int type = codeRes.getLeft();
if (type < 0) {
c.announce(MaplePacketCreator.showCashShopMessage((byte) parseCouponResult(type)));
c.announce(PacketCreator.showCashShopMessage((byte) parseCouponResult(type)));
} else {
List<Item> cashItems = new LinkedList<>();
List<Pair<Integer, Integer>> items = new LinkedList<>();
@@ -260,9 +260,9 @@ public final class CouponCodeHandler extends AbstractMaplePacketHandler {
}
}
if (nxCredit != 0 || nxPrepaid != 0) { //coupon packet can only show maple points (afaik)
c.announce(MaplePacketCreator.showBoughtQuestItem(0));
c.announce(PacketCreator.showBoughtQuestItem(0));
} else {
c.announce(MaplePacketCreator.showCouponRedeemedItems(c.getAccID(), maplePoints, mesos, cashItems, items));
c.announce(PacketCreator.showCouponRedeemedItems(c.getAccID(), maplePoints, mesos, cashItems, items));
}
c.enableCSActions();
}

6
src/main/java/net/server/channel/handlers/DamageSummonHandler.java
View File

@@ -25,9 +25,9 @@ import client.MapleBuffStat;
import client.MapleCharacter;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import server.maps.MapleSummon;
import server.maps.MapleMapObject;
import tools.MaplePacketCreator;
import server.maps.MapleSummon;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class DamageSummonHandler extends AbstractMaplePacketHandler {
@@ -48,7 +48,7 @@ public final class DamageSummonHandler extends AbstractMaplePacketHandler {
if (summon.getHP() <= 0) {
player.cancelEffectFromBuffStat(MapleBuffStat.PUPPET);
}
player.getMap().broadcastMessage(player, MaplePacketCreator.damageSummon(player.getId(), oid, damage, monsterIdFrom), summon.getPosition());
player.getMap().broadcastMessage(player, PacketCreator.damageSummon(player.getId(), oid, damage, monsterIdFrom), summon.getPosition());
}
}
}

4
src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java
View File

@@ -27,7 +27,7 @@ import net.AbstractMaplePacketHandler;
import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteResult;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class DenyPartyRequestHandler extends AbstractMaplePacketHandler {
@@ -43,7 +43,7 @@ public final class DenyPartyRequestHandler extends AbstractMaplePacketHandler {
if (MapleInviteCoordinator.answerInvite(InviteType.PARTY, chr.getId(), cfrom.getPartyId(), false).result == InviteResult.DENIED) {
chr.updatePartySearchAvailability(chr.getParty() == null);
cfrom.getClient().announce(MaplePacketCreator.partyStatusMessage(23, chr.getName()));
cfrom.getClient().announce(PacketCreator.partyStatusMessage(23, chr.getName()));
}
}
}

8
src/main/java/net/server/channel/handlers/DoorHandler.java
View File

@@ -26,7 +26,7 @@ import client.MapleClient;
import net.AbstractMaplePacketHandler;
import server.maps.MapleDoorObject;
import server.maps.MapleMapObject;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -41,7 +41,7 @@ public final class DoorHandler extends AbstractMaplePacketHandler {
MapleCharacter chr = c.getPlayer();
if (chr.isChangingMaps() || chr.isBanned()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -55,7 +55,7 @@ public final class DoorHandler extends AbstractMaplePacketHandler {
}
}
c.announce(MaplePacketCreator.blockedMessage(6));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.blockedMessage(6));
c.announce(PacketCreator.enableActions());
}
}

5
src/main/java/net/server/channel/handlers/DueyHandler.java
View File

@@ -24,9 +24,8 @@ package net.server.channel.handlers;
import client.MapleClient;
import client.processor.npc.DueyProcessor;
import config.YamlConfig;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class DueyHandler extends AbstractMaplePacketHandler {
@@ -34,7 +33,7 @@ public final class DueyHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
if (!YamlConfig.config.server.USE_DUEY){
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}

22
src/main/java/net/server/channel/handlers/EnterCashShopHandler.java
View File

@@ -26,7 +26,7 @@ import client.MapleClient;
import net.AbstractMaplePacketHandler;
import net.server.Server;
import server.maps.MapleMiniDungeonInfo;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -40,19 +40,19 @@ public class EnterCashShopHandler extends AbstractMaplePacketHandler {
MapleCharacter mc = c.getPlayer();
if (mc.cannotEnterCashShop()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if(mc.getEventInstance() != null) {
c.announce(MaplePacketCreator.serverNotice(5, "Entering Cash Shop or MTS are disabled when registered on an event."));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.serverNotice(5, "Entering Cash Shop or MTS are disabled when registered on an event."));
c.announce(PacketCreator.enableActions());
return;
}
if(MapleMiniDungeonInfo.isDungeonMap(mc.getMapId())) {
c.announce(MaplePacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
c.announce(PacketCreator.enableActions());
return;
}
@@ -79,11 +79,11 @@ public class EnterCashShopHandler extends AbstractMaplePacketHandler {
mc.forfeitExpirableQuests();
mc.cancelQuestExpirationTask();
c.announce(MaplePacketCreator.openCashShop(c, false));
c.announce(MaplePacketCreator.showCashInventory(c));
c.announce(MaplePacketCreator.showGifts(mc.getCashShop().loadGifts()));
c.announce(MaplePacketCreator.showWishList(mc, false));
c.announce(MaplePacketCreator.showCash(mc));
c.announce(PacketCreator.openCashShop(c, false));
c.announce(PacketCreator.showCashInventory(c));
c.announce(PacketCreator.showGifts(mc.getCashShop().loadGifts()));
c.announce(PacketCreator.showWishList(mc, false));
c.announce(PacketCreator.showCash(mc));
c.getChannelServer().removePlayer(mc);
mc.getMap().removePlayer(mc);

34
src/main/java/net/server/channel/handlers/EnterMTSHandler.java
View File

@@ -33,7 +33,7 @@ import server.MTSItemInfo;
import server.maps.FieldLimit;
import server.maps.MapleMiniDungeonInfo;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.sql.Connection;
@@ -51,38 +51,38 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler {
if(!chr.isAlive() && YamlConfig.config.server.USE_BUYBACK_SYSTEM) {
BuybackProcessor.processBuyback(c);
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
} else {
if (!YamlConfig.config.server.USE_MTS) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if(chr.getEventInstance() != null) {
c.announce(MaplePacketCreator.serverNotice(5, "Entering Cash Shop or MTS are disabled when registered on an event."));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.serverNotice(5, "Entering Cash Shop or MTS are disabled when registered on an event."));
c.announce(PacketCreator.enableActions());
return;
}
if(MapleMiniDungeonInfo.isDungeonMap(chr.getMapId())) {
c.announce(MaplePacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
c.announce(PacketCreator.enableActions());
return;
}
if (FieldLimit.CANNOTMIGRATE.check(chr.getMap().getFieldLimit())) {
chr.dropMessage(1, "You can't do it here in this map.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if (!chr.isAlive()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if (chr.getLevel() < 10) {
c.announce(MaplePacketCreator.blockedMessage2(5));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.blockedMessage2(5));
c.announce(PacketCreator.enableActions());
return;
}
@@ -110,14 +110,14 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler {
c.getChannelServer().removePlayer(chr);
chr.getMap().removePlayer(c.getPlayer());
try {
c.announce(MaplePacketCreator.openCashShop(c, true));
c.announce(PacketCreator.openCashShop(c, true));
} catch (Exception ex) {
ex.printStackTrace();
}
chr.getCashShop().open(true);// xD
c.enableCSActions();
c.announce(MaplePacketCreator.MTSWantedListingOver(0, 0));
c.announce(MaplePacketCreator.showMTSCash(c.getPlayer()));
c.announce(PacketCreator.MTSWantedListingOver(0, 0));
c.announce(PacketCreator.showMTSCash(c.getPlayer()));
List<MTSItemInfo> items = new ArrayList<>();
int pages = 0;
try (Connection con = DatabaseConnection.getConnection()) {
@@ -171,9 +171,9 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler {
} catch (SQLException e) {
e.printStackTrace();
}
c.announce(MaplePacketCreator.sendMTS(items, 1, 0, 0, pages));
c.announce(MaplePacketCreator.transferInventory(getTransfer(chr.getId())));
c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(chr.getId())));
c.announce(PacketCreator.sendMTS(items, 1, 0, 0, pages));
c.announce(PacketCreator.transferInventory(getTransfer(chr.getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(chr.getId())));
}
}

24
src/main/java/net/server/channel/handlers/FamilyAddHandler.java
View File

@@ -21,13 +21,13 @@
*/
package net.server.channel.handlers;
import config.YamlConfig;
import client.MapleCharacter;
import client.MapleClient;
import config.YamlConfig;
import net.AbstractMaplePacketHandler;
import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -45,26 +45,26 @@ public final class FamilyAddHandler extends AbstractMaplePacketHandler {
MapleCharacter addChr = c.getChannelServer().getPlayerStorage().getCharacterByName(toAdd);
MapleCharacter chr = c.getPlayer();
if(addChr == null) {
c.announce(MaplePacketCreator.sendFamilyMessage(65, 0));
c.announce(PacketCreator.sendFamilyMessage(65, 0));
} else if(addChr == chr) { //only possible through packet editing/client editing i think?
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
} else if(addChr.getMap() != chr.getMap() || (addChr.isHidden()) && chr.gmLevel() < addChr.gmLevel()) {
c.announce(MaplePacketCreator.sendFamilyMessage(69, 0));
c.announce(PacketCreator.sendFamilyMessage(69, 0));
} else if(addChr.getLevel() <= 10) {
c.announce(MaplePacketCreator.sendFamilyMessage(77, 0));
c.announce(PacketCreator.sendFamilyMessage(77, 0));
} else if(Math.abs(addChr.getLevel() - chr.getLevel()) > 20) {
c.announce(MaplePacketCreator.sendFamilyMessage(72, 0));
c.announce(PacketCreator.sendFamilyMessage(72, 0));
} else if(addChr.getFamily() != null && addChr.getFamily() == chr.getFamily()) { //same family
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
} else if(MapleInviteCoordinator.hasInvite(InviteType.FAMILY, addChr.getId())) {
c.announce(MaplePacketCreator.sendFamilyMessage(73, 0));
c.announce(PacketCreator.sendFamilyMessage(73, 0));
} else if(chr.getFamily() != null && addChr.getFamily() != null && addChr.getFamily().getTotalGenerations() + chr.getFamily().getTotalGenerations() > YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
c.announce(MaplePacketCreator.sendFamilyMessage(76, 0));
c.announce(PacketCreator.sendFamilyMessage(76, 0));
} else {
MapleInviteCoordinator.createInvite(InviteType.FAMILY, chr, addChr, addChr.getId());
addChr.getClient().announce(MaplePacketCreator.sendFamilyInvite(chr.getId(), chr.getName()));
addChr.getClient().announce(PacketCreator.sendFamilyInvite(chr.getId(), chr.getName()));
chr.dropMessage("The invite has been sent.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
}
}
}

4
src/main/java/net/server/channel/handlers/FamilyPreceptsHandler.java
View File

@@ -3,7 +3,7 @@ package net.server.channel.handlers;
import client.MapleClient;
import client.MapleFamily;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public class FamilyPreceptsHandler extends AbstractMaplePacketHandler {
@@ -17,7 +17,7 @@ public class FamilyPreceptsHandler extends AbstractMaplePacketHandler {
if(newPrecepts.length() > 200) return;
family.setMessage(newPrecepts, true);
//family.broadcastFamilyInfoUpdate(); //probably don't need to broadcast for this?
c.announce(MaplePacketCreator.getFamilyInfo(c.getPlayer().getFamilyEntry()));
c.announce(PacketCreator.getFamilyInfo(c.getPlayer().getFamilyEntry()));
}
}

10
src/main/java/net/server/channel/handlers/FamilySeparateHandler.java
View File

@@ -24,7 +24,7 @@ import client.MapleFamily;
import client.MapleFamilyEntry;
import config.YamlConfig;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public class FamilySeparateHandler extends AbstractMaplePacketHandler {
@@ -52,18 +52,18 @@ public class FamilySeparateHandler extends AbstractMaplePacketHandler {
int cost = 2500 * levelDiff;
cost += levelDiff * levelDiff;
if(c.getPlayer().getMeso() < cost) {
c.announce(MaplePacketCreator.sendFamilyMessage(isSenior ? 81 : 80, cost));
c.announce(PacketCreator.sendFamilyMessage(isSenior ? 81 : 80, cost));
return;
}
c.getPlayer().gainMeso(-cost);
int repCost = separateRepCost(forkOn);
senior.gainReputation(-repCost, false);
if(senior.getSenior() != null) senior.getSenior().gainReputation(-(repCost/2), false);
forkOn.announceToSenior(MaplePacketCreator.serverNotice(5, forkOn.getName() + " has left the family."), true);
forkOn.announceToSenior(PacketCreator.serverNotice(5, forkOn.getName() + " has left the family."), true);
forkOn.fork();
c.announce(MaplePacketCreator.getFamilyInfo(forkOn)); //pedigree info will be requested from the client if the window is open
c.announce(PacketCreator.getFamilyInfo(forkOn)); //pedigree info will be requested from the client if the window is open
forkOn.updateSeniorFamilyInfo(true);
c.announce(MaplePacketCreator.sendFamilyMessage(1, 0));
c.announce(PacketCreator.sendFamilyMessage(1, 0));
}

4
src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java
View File

@@ -11,7 +11,7 @@ import net.server.coordinator.world.MapleInviteCoordinator.InviteResult;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public class FamilySummonResponseHandler extends AbstractMaplePacketHandler {
@@ -32,7 +32,7 @@ public class FamilySummonResponseHandler extends AbstractMaplePacketHandler {
} else {
inviterEntry.refundEntitlement(MapleFamilyEntitlement.SUMMON_FAMILY);
inviterEntry.gainReputation(MapleFamilyEntitlement.SUMMON_FAMILY.getRepCost(), false); //refund rep cost if declined
inviter.announce(MaplePacketCreator.getFamilyInfo(inviterEntry));
inviter.announce(PacketCreator.getFamilyInfo(inviterEntry));
inviter.dropMessage(5, c.getPlayer().getName() + " has denied the summon request.");
}
}

16
src/main/java/net/server/channel/handlers/FamilyUseHandler.java
View File

@@ -31,7 +31,7 @@ import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import server.maps.FieldLimit;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -51,7 +51,7 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler {
if(entry.getReputation() < cost || entry.isEntitlementUsed(type)) {
return; // shouldn't even be able to request it
}
c.announce(MaplePacketCreator.getFamilyInfo(entry));
c.announce(PacketCreator.getFamilyInfo(entry));
MapleCharacter victim;
if(type == MapleFamilyEntitlement.FAMILY_REUINION || type == MapleFamilyEntitlement.SUMMON_FAMILY) {
victim = c.getChannelServer().getPlayerStorage().getCharacterByName(slea.readMapleAsciiString());
@@ -67,7 +67,7 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler {
c.getPlayer().changeMap(victim.getMap(), victim.getMap().getPortal(0));
useEntitlement(entry, type);
} else {
c.announce(MaplePacketCreator.sendFamilyMessage(75, 0)); // wrong message, but close enough. (client should check this first anyway)
c.announce(PacketCreator.sendFamilyMessage(75, 0)); // wrong message, but close enough. (client should check this first anyway)
return;
}
} else {
@@ -75,20 +75,20 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler {
&& (ownMap.getForcedReturnId() == 999999999 || ownMap.getId() < 100000000) && ownMap.getEventInstance() == null) {
if(MapleInviteCoordinator.hasInvite(InviteType.FAMILY_SUMMON, victim.getId())) {
c.announce(MaplePacketCreator.sendFamilyMessage(74, 0));
c.announce(PacketCreator.sendFamilyMessage(74, 0));
return;
}
MapleInviteCoordinator.createInvite(InviteType.FAMILY_SUMMON, c.getPlayer(), victim, victim.getId(), c.getPlayer().getMap());
victim.announce(MaplePacketCreator.sendFamilySummonRequest(c.getPlayer().getFamily().getName(), c.getPlayer().getName()));
victim.announce(PacketCreator.sendFamilySummonRequest(c.getPlayer().getFamily().getName(), c.getPlayer().getName()));
useEntitlement(entry, type);
} else {
c.announce(MaplePacketCreator.sendFamilyMessage(75, 0));
c.announce(PacketCreator.sendFamilyMessage(75, 0));
return;
}
}
}
} else {
c.announce(MaplePacketCreator.sendFamilyMessage(67, 0));
c.announce(PacketCreator.sendFamilyMessage(67, 0));
}
}
} else if(type == MapleFamilyEntitlement.FAMILY_BONDING) {
@@ -133,7 +133,7 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler {
private boolean useEntitlement(MapleFamilyEntry entry, MapleFamilyEntitlement entitlement) {
if(entry.useEntitlement(entitlement)) {
entry.gainReputation(-entitlement.getRepCost(), false);
entry.getChr().announce(MaplePacketCreator.getFamilyInfo(entry));
entry.getChr().announce(PacketCreator.getFamilyInfo(entry));
return true;
}
return false;

4
src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java
View File

@@ -27,7 +27,7 @@ import server.life.MapleMonster;
import server.life.MapleMonsterInformationProvider;
import server.maps.MapleMap;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public class FieldDamageMobHandler extends AbstractMaplePacketHandler {
@@ -52,7 +52,7 @@ public class FieldDamageMobHandler extends AbstractMaplePacketHandler {
return;
}
map.broadcastMessage(chr, MaplePacketCreator.damageMonster(mobOid, dmg), true);
map.broadcastMessage(chr, PacketCreator.damageMonster(mobOid, dmg), true);
map.damageMonster(chr, mob, dmg);
}
}

3
src/main/java/net/server/channel/handlers/FredrickHandler.java
View File

@@ -24,7 +24,6 @@ package net.server.channel.handlers;
import client.MapleCharacter;
import client.MapleClient;
import client.processor.npc.FredrickProcessor;
import net.AbstractMaplePacketHandler;
import tools.data.input.SeekableLittleEndianAccessor;
@@ -41,7 +40,7 @@ public class FredrickHandler extends AbstractMaplePacketHandler {
switch (operation) {
case 0x19: //Will never come...
//c.announce(MaplePacketCreator.getFredrick((byte) 0x24));
//c.announce(PacketCreator.getFredrick((byte) 0x24));
break;
case 0x1A:
FredrickProcessor.fredrickRetrieveItems(c);

8
src/main/java/net/server/channel/handlers/GeneralChatHandler.java
View File

@@ -29,7 +29,7 @@ import config.YamlConfig;
import net.AbstractMaplePacketHandler;
import tools.FilePrinter;
import tools.LogHelper;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class GeneralChatHandler extends AbstractMaplePacketHandler {
@@ -38,7 +38,7 @@ public final class GeneralChatHandler extends AbstractMaplePacketHandler {
String s = slea.readMapleAsciiString();
MapleCharacter chr = c.getPlayer();
if(chr.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
if (s.length() > Byte.MAX_VALUE && !chr.isGM()) {
@@ -58,12 +58,12 @@ public final class GeneralChatHandler extends AbstractMaplePacketHandler {
}
if (!chr.isHidden()) {
chr.getMap().broadcastMessage(MaplePacketCreator.getChatText(chr.getId(), s, chr.getWhiteChat(), show));
chr.getMap().broadcastMessage(PacketCreator.getChatText(chr.getId(), s, chr.getWhiteChat(), show));
if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
LogHelper.logChat(c, "General", s);
}
} else {
chr.getMap().broadcastGMMessage(MaplePacketCreator.getChatText(chr.getId(), s, chr.getWhiteChat(), show));
chr.getMap().broadcastGMMessage(PacketCreator.getChatText(chr.getId(), s, chr.getWhiteChat(), show));
if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
LogHelper.logChat(c, "GM General", s);
}

7
src/main/java/net/server/channel/handlers/GiveFameHandler.java
View File

@@ -23,12 +23,11 @@ package net.server.channel.handlers;
import client.MapleCharacter;
import client.MapleCharacter.FameStatus;
import client.autoban.AutobanFactory;
import client.MapleClient;
import client.MapleStat;
import client.autoban.AutobanFactory;
import net.AbstractMaplePacketHandler;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class GiveFameHandler extends AbstractMaplePacketHandler {
@@ -58,7 +57,7 @@ public final class GiveFameHandler extends AbstractMaplePacketHandler {
player.message("Could not process the request, since this character currently has the minimum/maximum level of fame.");
}
} else {
c.announce(MaplePacketCreator.giveFameErrorResponse(status == FameStatus.NOT_TODAY ? 3 : 4));
c.announce(PacketCreator.giveFameErrorResponse(status == FameStatus.NOT_TODAY ? 3 : 4));
}
}
}

11
src/main/java/net/server/channel/handlers/GrenadeEffectHandler.java
View File

@@ -19,15 +19,16 @@
*/
package net.server.channel.handlers;
import client.MapleClient;
import client.MapleCharacter;
import client.MapleClient;
import constants.skills.Gunslinger;
import constants.skills.NightWalker;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.awt.Point;
import tools.FilePrinter;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.awt.*;
/*
* @author GabrielSin
@@ -46,7 +47,7 @@ public class GrenadeEffectHandler extends AbstractMaplePacketHandler {
case Gunslinger.GRENADE:
int skillLevel = chr.getSkillLevel(skillId);
if (skillLevel > 0) {
chr.getMap().broadcastMessage(chr, MaplePacketCreator.throwGrenade(chr.getId(), position, keyDown, skillId, skillLevel), position);
chr.getMap().broadcastMessage(chr, PacketCreator.throwGrenade(chr.getId(), position, keyDown, skillId, skillLevel), position);
}
break;
default:

20
src/main/java/net/server/channel/handlers/GuildOperationHandler.java
View File

@@ -33,7 +33,7 @@ import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildResponse;
import net.server.world.MapleParty;
import net.server.world.World;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.util.HashSet;
@@ -59,7 +59,7 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
int allianceId = -1;
switch (type) {
case 0x00:
//c.announce(MaplePacketCreator.showGuildInfo(mc));
//c.announce(PacketCreator.showGuildInfo(mc));
break;
case 0x02:
if (mc.getGuildId() > 0) {
@@ -140,14 +140,14 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
return;
}
c.announce(MaplePacketCreator.showGuildInfo(mc));
c.announce(PacketCreator.showGuildInfo(mc));
allianceId = mc.getGuild().getAllianceId();
if(allianceId > 0) Server.getInstance().getAlliance(allianceId).updateAlliancePackets(mc);
mc.saveGuildStatus(); // update database
mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildNameChanged(mc.getId(), mc.getGuild().getName())); // thanks Vcoc for pointing out an issue with updating guild tooltip to players in the map
mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildMarkChanged(mc.getId(), mc.getGuild()));
mc.getMap().broadcastMessage(mc, PacketCreator.guildNameChanged(mc.getId(), mc.getGuild().getName())); // thanks Vcoc for pointing out an issue with updating guild tooltip to players in the map
mc.getMap().broadcastMessage(mc, PacketCreator.guildMarkChanged(mc.getId(), mc.getGuild()));
break;
case 0x07:
cid = slea.readInt();
@@ -159,16 +159,16 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
allianceId = mc.getGuild().getAllianceId();
c.announce(MaplePacketCreator.updateGP(mc.getGuildId(), 0));
c.announce(PacketCreator.updateGP(mc.getGuildId(), 0));
Server.getInstance().leaveGuild(mc.getMGC());
c.announce(MaplePacketCreator.showGuildInfo(null));
c.announce(PacketCreator.showGuildInfo(null));
if(allianceId > 0) Server.getInstance().getAlliance(allianceId).updateAlliancePackets(mc);
mc.getMGC().setGuildId(0);
mc.getMGC().setGuildRank(5);
mc.saveGuildStatus();
mc.getMap().broadcastMessage(mc, MaplePacketCreator.guildNameChanged(mc.getId(), ""));
mc.getMap().broadcastMessage(mc, PacketCreator.guildNameChanged(mc.getId(), ""));
break;
case 0x08:
allianceId = mc.getGuild().getAllianceId();
@@ -213,7 +213,7 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
return;
}
if (mc.getMeso() < YamlConfig.config.server.CHANGE_EMBLEM_COST) {
c.announce(MaplePacketCreator.serverNotice(1, "You do not have " + GameConstants.numberWithCommas(YamlConfig.config.server.CHANGE_EMBLEM_COST) + " mesos to change the Guild emblem."));
c.announce(PacketCreator.serverNotice(1, "You do not have " + GameConstants.numberWithCommas(YamlConfig.config.server.CHANGE_EMBLEM_COST) + " mesos to change the Guild emblem."));
return;
}
short bg = slea.readShort();
@@ -224,7 +224,7 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
if (mc.getGuild() != null && mc.getGuild().getAllianceId() > 0) {
MapleAlliance alliance = mc.getAlliance();
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.getGuildAlliances(alliance, c.getWorld()), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), PacketCreator.getGuildAlliances(alliance, c.getWorld()), -1, -1);
}
mc.gainMeso(-YamlConfig.config.server.CHANGE_EMBLEM_COST, true, false, true);

4
src/main/java/net/server/channel/handlers/HealOvertimeHandler.java
View File

@@ -28,8 +28,8 @@ import client.autoban.AutobanManager;
import net.AbstractMaplePacketHandler;
import net.server.Server;
import server.maps.MapleMap;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import tools.MaplePacketCreator;
public final class HealOvertimeHandler extends AbstractMaplePacketHandler {
@Override
@@ -54,7 +54,7 @@ public final class HealOvertimeHandler extends AbstractMaplePacketHandler {
}
chr.addHP(healHP);
chr.getMap().broadcastMessage(chr, MaplePacketCreator.showHpHealed(chr.getId(), healHP), false);
chr.getMap().broadcastMessage(chr, PacketCreator.showHpHealed(chr.getId(), healHP), false);
abm.spam(0, timestamp);
}
short healMP = slea.readShort();

23
src/main/java/net/server/channel/handlers/HiredMerchantRequest.java
View File

@@ -21,21 +21,22 @@
*/
package net.server.channel.handlers;
import client.inventory.ItemFactory;
import client.MapleCharacter;
import java.sql.SQLException;
import java.util.Arrays;
import client.MapleClient;
import client.inventory.ItemFactory;
import constants.game.GameConstants;
import java.awt.Point;
import net.AbstractMaplePacketHandler;
import server.maps.MaplePortal;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import server.maps.MaplePlayerShop;
import tools.MaplePacketCreator;
import server.maps.MaplePortal;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.awt.*;
import java.sql.SQLException;
import java.util.Arrays;
/**
*
* @author XoticStory
@@ -52,11 +53,11 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler {
MaplePlayerShop shop = mc.getPlayerShop();
if (shop != null && shop.isOwner(mc)) {
chr.announce(MaplePacketCreator.getMiniRoomError(13));
chr.announce(PacketCreator.getMiniRoomError(13));
return;
}
} else {
chr.announce(MaplePacketCreator.getMiniRoomError(13));
chr.announce(PacketCreator.getMiniRoomError(13));
return;
}
}
@@ -64,7 +65,7 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler {
Point cpos = chr.getPosition();
MaplePortal portal = chr.getMap().findClosestTeleportPortal(cpos);
if (portal != null && portal.getPosition().distance(cpos) < 120.0) {
chr.announce(MaplePacketCreator.getMiniRoomError(10));
chr.announce(PacketCreator.getMiniRoomError(10));
return;
}
} catch (Exception e) {
@@ -75,9 +76,9 @@ public final class HiredMerchantRequest extends AbstractMaplePacketHandler {
if (!chr.hasMerchant()) {
try {
if (ItemFactory.MERCHANT.loadItems(chr.getId(), false).isEmpty() && chr.getMerchantMeso() == 0) {
c.announce(MaplePacketCreator.hiredMerchantBox());
c.announce(PacketCreator.hiredMerchantBox());
} else {
chr.announce(MaplePacketCreator.retrieveFirstMessage());
chr.announce(PacketCreator.retrieveFirstMessage());
}
} catch (SQLException ex) {
ex.printStackTrace();

16
src/main/java/net/server/channel/handlers/InventoryMergeHandler.java
View File

@@ -21,18 +21,18 @@
*/
package net.server.channel.handlers;
import config.YamlConfig;
import net.AbstractMaplePacketHandler;
import client.inventory.manipulator.MapleInventoryManipulator;
import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import client.MapleCharacter;
import client.MapleClient;
import client.inventory.Item;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import config.YamlConfig;
import net.AbstractMaplePacketHandler;
import net.server.Server;
import server.MapleItemInformationProvider;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class InventoryMergeHandler extends AbstractMaplePacketHandler {
@@ -43,7 +43,7 @@ public final class InventoryMergeHandler extends AbstractMaplePacketHandler {
chr.getAutobanManager().setTimestamp(2, Server.getInstance().getCurrentTimestamp(), 4);
if(!YamlConfig.config.server.USE_ITEM_SORT) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -106,7 +106,7 @@ public final class InventoryMergeHandler extends AbstractMaplePacketHandler {
inventory.unlockInventory();
}
c.announce(MaplePacketCreator.finishedSort(inventoryType.getType()));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.finishedSort(inventoryType.getType()));
c.announce(PacketCreator.enableActions());
}
}

10
src/main/java/net/server/channel/handlers/InventorySortHandler.java
View File

@@ -28,7 +28,7 @@ import config.YamlConfig;
import net.AbstractMaplePacketHandler;
import net.server.Server;
import server.MapleItemInformationProvider;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.util.ArrayList;
@@ -267,7 +267,7 @@ public final class InventorySortHandler extends AbstractMaplePacketHandler {
chr.getAutobanManager().setTimestamp(3, Server.getInstance().getCurrentTimestamp(), 4);
if(!YamlConfig.config.server.USE_ITEM_SORT) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -308,8 +308,8 @@ public final class InventorySortHandler extends AbstractMaplePacketHandler {
inventory.unlockInventory();
}
c.announce(MaplePacketCreator.modifyInventory(true, mods));
c.announce(MaplePacketCreator.finishedSort2(invType));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.modifyInventory(true, mods));
c.announce(PacketCreator.finishedSort2(invType));
c.announce(PacketCreator.enableActions());
}
}

6
src/main/java/net/server/channel/handlers/ItemMoveHandler.java
View File

@@ -23,9 +23,9 @@ package net.server.channel.handlers;
import client.MapleClient;
import client.inventory.MapleInventoryType;
import net.AbstractMaplePacketHandler;
import client.inventory.manipulator.MapleInventoryManipulator;
import tools.MaplePacketCreator;
import net.AbstractMaplePacketHandler;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -37,7 +37,7 @@ public final class ItemMoveHandler extends AbstractMaplePacketHandler {
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
slea.skip(4);
if(c.getPlayer().getAutobanManager().getLastSpam(6) + 300 > currentServerTime()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}

13
src/main/java/net/server/channel/handlers/ItemRewardHandler.java
View File

@@ -24,18 +24,19 @@ package net.server.channel.handlers;
import client.MapleClient;
import client.inventory.Item;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import constants.inventory.ItemConstants;
import java.util.List;
import net.AbstractMaplePacketHandler;
import net.server.Server;
import client.inventory.manipulator.MapleInventoryManipulator;
import server.MapleItemInformationProvider;
import server.MapleItemInformationProvider.RewardItem;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor;
import java.util.List;
/**
* @author Jay Estrella
* @author kevintjuh93
@@ -53,7 +54,7 @@ public final class ItemRewardHandler extends AbstractMaplePacketHandler {
Pair<Integer, List<RewardItem>> rewards = ii.getItemReward(itemId);
for (RewardItem reward : rewards.getRight()) {
if (!MapleInventoryManipulator.checkSpace(c, reward.itemid, reward.quantity, "")) {
c.announce(MaplePacketCreator.getShowInventoryFull());
c.announce(PacketCreator.getShowInventoryFull());
break;
}
if (Randomizer.nextInt(rewards.getLeft()) < reward.prob) {//Is it even possible to get an item with prob 1?
@@ -71,11 +72,11 @@ public final class ItemRewardHandler extends AbstractMaplePacketHandler {
String msg = reward.worldmsg;
msg.replaceAll("/name", c.getPlayer().getName());
msg.replaceAll("/item", ii.getName(reward.itemid));
Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(6, msg));
Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, msg));
}
break;
}
}
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
}
}

6
src/main/java/net/server/channel/handlers/LeftKnockbackHandler.java
View File

@@ -24,7 +24,7 @@ package net.server.channel.handlers;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -33,7 +33,7 @@ import tools.data.input.SeekableLittleEndianAccessor;
*/
public class LeftKnockbackHandler extends AbstractMaplePacketHandler {
public void handlePacket(SeekableLittleEndianAccessor slea, final MapleClient c) {
c.announce(MaplePacketCreator.leftKnockBack());
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.leftKnockBack());
c.announce(PacketCreator.enableActions());
}
}

76
src/main/java/net/server/channel/handlers/MTSHandler.java
View File

@@ -34,7 +34,7 @@ import net.server.channel.Channel;
import server.MTSItemInfo;
import server.MapleItemInformationProvider;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.data.input.SeekableLittleEndianAccessor;
@@ -115,8 +115,8 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
if (rs.getInt(1) > 10) { //They have more than 10 items up for sale already!
c.getPlayer().dropMessage(1, "You already have 10 items up for auction!");
c.announce(getMTS(1, 0, 0));
c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
rs.close();
ps.close();
return;
@@ -219,11 +219,11 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
e.printStackTrace();
}
c.getPlayer().gainMeso(-5000, false);
c.announce(MaplePacketCreator.MTSConfirmSell());
c.announce(PacketCreator.MTSConfirmSell());
c.announce(getMTS(1, 0, 0));
c.enableCSActions();
c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
}
} else if (op == 3) { //send offer for wanted item
} else if (op == 4) { //list wanted item
@@ -248,8 +248,8 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
c.getPlayer().changeTab(tab);
c.getPlayer().changeType(type);
c.enableCSActions();
c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 6) { //search
int tab = slea.readInt();
int type = slea.readInt();
@@ -261,11 +261,11 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
c.getPlayer().changeType(type);
c.getPlayer().changeCI(ci);
c.enableCSActions();
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
c.announce(getMTSSearch(tab, type, ci, search, c.getPlayer().getCurrentPage()));
c.announce(MaplePacketCreator.showMTSCash(c.getPlayer()));
c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(PacketCreator.showMTSCash(c.getPlayer()));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 7) { //cancel sale
int id = slea.readInt(); //id of the item
Connection con = null;
@@ -286,8 +286,8 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
}
c.enableCSActions();
c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
} else if (op == 8) { //transfer item from transfer inv.
int id = slea.readInt(); //id of the item
Connection con = null;
@@ -346,8 +346,8 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
c.enableCSActions();
c.announce(getCart(c.getPlayer().getId()));
c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.announce(MaplePacketCreator.MTSConfirmTransfer(i.getQuantity(), i.getPosition()));
c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.MTSConfirmTransfer(i.getQuantity(), i.getPosition()));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
}
rs.close();
ps.close();
@@ -387,9 +387,9 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
}
c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.enableCSActions();
c.announce(MaplePacketCreator.enableActions());
c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(PacketCreator.enableActions());
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 10) { //delete from cart
int id = slea.readInt(); //id of the item
Connection con = null;
@@ -406,8 +406,8 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
}
c.announce(getCart(c.getPlayer().getId()));
c.enableCSActions();
c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 12) { //put item up for auction
} else if (op == 13) { //cancel wanted cart thing
} else if (op == 14) { //buy auction item now
@@ -459,13 +459,13 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
c.getPlayer().getCashShop().gainCash(4, -price);
c.enableCSActions();
c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.announce(MaplePacketCreator.MTSConfirmBuy());
c.announce(MaplePacketCreator.showMTSCash(c.getPlayer()));
c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.MTSConfirmBuy());
c.announce(PacketCreator.showMTSCash(c.getPlayer()));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(PacketCreator.enableActions());
} else {
c.announce(MaplePacketCreator.MTSFailBuy());
c.announce(PacketCreator.MTSFailBuy());
}
}
rs.close();
@@ -473,7 +473,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
con.close();
} catch (SQLException e) {
e.printStackTrace();
c.announce(MaplePacketCreator.MTSFailBuy());
c.announce(PacketCreator.MTSFailBuy());
}
} else if (op == 17) { //buy from cart
int id = slea.readInt(); //id of the item
@@ -520,12 +520,12 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
c.getPlayer().getCashShop().gainCash(4, -price);
c.announce(getCart(c.getPlayer().getId()));
c.enableCSActions();
c.announce(MaplePacketCreator.MTSConfirmBuy());
c.announce(MaplePacketCreator.showMTSCash(c.getPlayer()));
c.announce(MaplePacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(MaplePacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(PacketCreator.MTSConfirmBuy());
c.announce(PacketCreator.showMTSCash(c.getPlayer()));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else {
c.announce(MaplePacketCreator.MTSFailBuy());
c.announce(PacketCreator.MTSFailBuy());
}
}
rs.close();
@@ -533,13 +533,13 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
con.close();
} catch (SQLException e) {
e.printStackTrace();
c.announce(MaplePacketCreator.MTSFailBuy());
c.announce(PacketCreator.MTSFailBuy());
}
} else {
System.out.println("Unhandled OP(MTS): " + op + " Packet: " + slea.toString());
}
} else {
c.announce(MaplePacketCreator.showMTSCash(c.getPlayer()));
c.announce(PacketCreator.showMTSCash(c.getPlayer()));
}
}
@@ -668,7 +668,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
} catch (SQLException e) {
e.printStackTrace();
}
return MaplePacketCreator.sendMTS(items, 4, 0, 0, pages);
return PacketCreator.sendMTS(items, 4, 0, 0, pages);
}
public List<MTSItemInfo> getTransfer(int cid) {
@@ -803,7 +803,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
} catch (SQLException e) {
e.printStackTrace();
}
return MaplePacketCreator.sendMTS(items, tab, type, page, pages); // resniff
return PacketCreator.sendMTS(items, tab, type, page, pages); // resniff
}
public byte[] getMTSSearch(int tab, int type, int cOi, String search, int page) {
@@ -904,6 +904,6 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
} catch (SQLException e) {
e.printStackTrace();
}
return MaplePacketCreator.sendMTS(items, tab, type, page, pages);
return PacketCreator.sendMTS(items, tab, type, page, pages);
}
}

14
src/main/java/net/server/channel/handlers/MagicDamageHandler.java
View File

@@ -21,11 +21,7 @@
*/
package net.server.channel.handlers;
import client.MapleBuffStat;
import client.MapleCharacter;
import client.MapleClient;
import client.Skill;
import client.SkillFactory;
import client.*;
import config.YamlConfig;
import constants.game.GameConstants;
import constants.skills.Bishop;
@@ -33,7 +29,7 @@ import constants.skills.Evan;
import constants.skills.FPArchMage;
import constants.skills.ILArchMage;
import server.MapleStatEffect;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class MagicDamageHandler extends AbstractDealDamageHandler {
@@ -59,11 +55,11 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler {
if (GameConstants.isDojo(chr.getMap().getId()) && attack.numAttacked > 0) {
chr.setDojoEnergy(chr.getDojoEnergy() + + YamlConfig.config.server.DOJO_ENERGY_ATK);
c.announce(MaplePacketCreator.getEnergy("energy", chr.getDojoEnergy()));
c.announce(PacketCreator.getEnergy("energy", chr.getDojoEnergy()));
}
int charge = (attack.skill == Evan.FIRE_BREATH || attack.skill == Evan.ICE_BREATH || attack.skill == FPArchMage.BIG_BANG || attack.skill == ILArchMage.BIG_BANG || attack.skill == Bishop.BIG_BANG) ? attack.charge : -1;
byte[] packet = MaplePacketCreator.magicAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, attack.allDamage, charge, attack.speed, attack.direction, attack.display);
byte[] packet = PacketCreator.magicAttack(chr, attack.skill, attack.skilllevel, attack.stance, attack.numAttackedAndDamage, attack.allDamage, charge, attack.speed, attack.direction, attack.display);
chr.getMap().broadcastMessage(chr, packet, false, true);
MapleStatEffect effect = attack.getAttackEffect(chr, null);
@@ -73,7 +69,7 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler {
if (chr.skillIsCooling(attack.skill)) {
return;
} else {
c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));
c.announce(PacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));
chr.addCooldown(attack.skill, currentServerTime(), effect_.getCooldown() * 1000);
}
}

12
src/main/java/net/server/channel/handlers/MesoDropHandler.java
View File

@@ -21,11 +21,11 @@
*/
package net.server.channel.handlers;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import client.MapleCharacter;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
*
@@ -37,7 +37,7 @@ public final class MesoDropHandler extends AbstractMaplePacketHandler {
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
MapleCharacter player = c.getPlayer();
if (!player.isAlive()) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
slea.skip(4);
@@ -48,14 +48,14 @@ public final class MesoDropHandler extends AbstractMaplePacketHandler {
if (meso <= player.getMeso() && meso > 9 && meso < 50001) {
player.gainMeso(-meso, false, true, false);
} else {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
} finally {
c.releaseClient();
}
} else {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}

16
src/main/java/net/server/channel/handlers/MessengerHandler.java
View File

@@ -31,7 +31,7 @@ import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult;
import net.server.world.MapleMessenger;
import net.server.world.MapleMessengerCharacter;
import net.server.world.World;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class MessengerHandler extends AbstractMaplePacketHandler {
@@ -82,30 +82,30 @@ public final class MessengerHandler extends AbstractMaplePacketHandler {
break;
case 0x03:
if (messenger == null) {
c.announce(MaplePacketCreator.messengerChat(player.getName() + " : This Maple Messenger is currently unavailable. Please quit this chat."));
c.announce(PacketCreator.messengerChat(player.getName() + " : This Maple Messenger is currently unavailable. Please quit this chat."));
} else if (messenger.getMembers().size() < 3) {
input = slea.readMapleAsciiString();
MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(input);
if (target != null) {
if (target.getMessenger() == null) {
if (MapleInviteCoordinator.createInvite(InviteType.MESSENGER, c.getPlayer(), messenger.getId(), target.getId())) {
target.getClient().announce(MaplePacketCreator.messengerInvite(c.getPlayer().getName(), messenger.getId()));
c.announce(MaplePacketCreator.messengerNote(input, 4, 1));
target.getClient().announce(PacketCreator.messengerInvite(c.getPlayer().getName(), messenger.getId()));
c.announce(PacketCreator.messengerNote(input, 4, 1));
} else {
c.announce(MaplePacketCreator.messengerChat(player.getName() + " : " + input + " is already managing a Maple Messenger invitation"));
c.announce(PacketCreator.messengerChat(player.getName() + " : " + input + " is already managing a Maple Messenger invitation"));
}
} else {
c.announce(MaplePacketCreator.messengerChat(player.getName() + " : " + input + " is already using Maple Messenger"));
c.announce(PacketCreator.messengerChat(player.getName() + " : " + input + " is already using Maple Messenger"));
}
} else {
if (world.find(input) > -1) {
world.messengerInvite(c.getPlayer().getName(), messenger.getId(), input, c.getChannel());
} else {
c.announce(MaplePacketCreator.messengerNote(input, 4, 0));
c.announce(PacketCreator.messengerNote(input, 4, 0));
}
}
} else {
c.announce(MaplePacketCreator.messengerChat(player.getName() + " : You cannot have more than 3 people in the Maple Messenger"));
c.announce(PacketCreator.messengerChat(player.getName() + " : You cannot have more than 3 people in the Maple Messenger"));
}
break;
case 0x05:

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