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

Merge pull request #48 from P0nk/outpacket

Browse Source 
Use OutPacket instead of MaplePacketLittleEndianWriter
This commit is contained in:
Ponk
2021-08-22 21:23:52 +02:00
committed by GitHub
parent 579e3c639f ffc0f3bc97
commit 2232022cf1
330 changed files with 10889 additions and 11893 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/event/2xEvent.js
View File

@@ -57,18 +57,18 @@ function cancelSchedule() {
function start() {
const Server = Java.type('net.server.Server');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
var world = Server.getInstance().getWorld(em.getChannelServer().getWorld());
world.setExpRate(8);
world.broadcastPacket(MaplePacketCreator.serverNotice(6, "The Bunny Onslaught Survival Scanner (BOSS) has detected an Easter Bunny onslaught soon! The GM team has activated the Emergency XP Pool (EXP) that doubles experience gained for the next two hours!"));
world.broadcastPacket(PacketCreator.serverNotice(6, "The Bunny Onslaught Survival Scanner (BOSS) has detected an Easter Bunny onslaught soon! The GM team has activated the Emergency XP Pool (EXP) that doubles experience gained for the next two hours!"));
}
function stop() {
const Server = Java.type('net.server.Server');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
var world = Server.getInstance().getWorld(em.getChannelServer().getWorld());
world.setExpRate(4);
world.broadcastPacket(MaplePacketCreator.serverNotice(6, "Unfortunately the Emergency XP Pool (EXP) has run out of juice for now and needs to recharge causing the EXP rate to go back to normal."));
world.broadcastPacket(PacketCreator.serverNotice(6, "Unfortunately the Emergency XP Pool (EXP) has run out of juice for now and needs to recharge causing the EXP rate to go back to normal."));
}
// ---------- FILLER FUNCTIONS ----------

4
scripts/event/3rdJob_bowman.js
View File

@@ -54,8 +54,8 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

4
scripts/event/3rdJob_magician.js
View File

@@ -54,8 +54,8 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

4
scripts/event/3rdJob_mount.js
View File

@@ -84,8 +84,8 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

4
scripts/event/3rdJob_pirate.js
View File

@@ -46,8 +46,8 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

4
scripts/event/3rdJob_thief.js
View File

@@ -54,8 +54,8 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

4
scripts/event/3rdJob_warrior.js
View File

@@ -54,8 +54,8 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

4
scripts/event/Aran_2ndmount.js
View File

@@ -60,8 +60,8 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 2);
em.setProperty("noEntry","true");
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

4
scripts/event/Aran_3rdmount.js
View File

@@ -61,8 +61,8 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 1);
em.setProperty("noEntry","true");
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

4
scripts/event/AreaBossBamboo.js
View File

@@ -50,9 +50,9 @@ function start() {
}
const Point = Java.type('java.awt.Point');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
mapObj.spawnMonsterOnGroundBelow(mobObj, new Point(560, 50));
mapObj.broadcastMessage(MaplePacketCreator.serverNotice(6, "From amongst the ruins shrouded by the mists, Bamboo Warrior appears."));
mapObj.broadcastMessage(PacketCreator.serverNotice(6, "From amongst the ruins shrouded by the mists, Bamboo Warrior appears."));
em.schedule("start", 3 * 60 *60 * 1000);
}

4
scripts/event/AreaBossCentipede.js
View File

@@ -49,11 +49,11 @@ function start() {
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
const Point = Java.type('java.awt.Point');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
var gcent = MapleLifeFactory.getMonster(5220004);
herbGarden.spawnMonsterOnGroundBelow(gcent, new Point(560, 50));
herbGarden.broadcastMessage(MaplePacketCreator.serverNotice(6, "From the mists surrounding the herb garden, the gargantuous Giant Centipede appears."));
herbGarden.broadcastMessage(PacketCreator.serverNotice(6, "From the mists surrounding the herb garden, the gargantuous Giant Centipede appears."));
em.schedule("start", 3 * 60 *60 * 1000);
}

4
scripts/event/AreaBossDeo.js
View File

@@ -49,11 +49,11 @@ function start() {
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
const Point = Java.type('java.awt.Point');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
var deo = MapleLifeFactory.getMonster(3220001);
royalCatthusDesert.spawnMonsterOnGroundBelow(deo, new Point(645, 275));
royalCatthusDesert.broadcastMessage(MaplePacketCreator.serverNotice(6, "Deo slowly appeared out of the sand dust."));
royalCatthusDesert.broadcastMessage(PacketCreator.serverNotice(6, "Deo slowly appeared out of the sand dust."));
em.schedule("start", 3 * 60 *60 * 1000);
}

4
scripts/event/AreaBossDoor1.js
View File

@@ -49,13 +49,13 @@ function start() {
}
const Point = Java.type('java.awt.Point');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
var boss = MapleLifeFactory.getMonster(bossMobid);
var bossPos = new Point(467, 0);
map.spawnMonsterOnGroundBelow(boss, bossPos);
map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg));
map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossDoor2.js
View File

@@ -50,12 +50,12 @@ function start() {
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
const Point = Java.type('java.awt.Point');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
var boss = MapleLifeFactory.getMonster(bossMobid);
var bossPos = new Point(201, 80);
map.spawnMonsterOnGroundBelow(boss, bossPos);
map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg));
map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossDoor3.js
View File

@@ -50,12 +50,12 @@ function start() {
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
const Point = Java.type('java.awt.Point');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
var boss = MapleLifeFactory.getMonster(bossMobid);
var bossPos = new Point(251, -841);
map.spawnMonsterOnGroundBelow(boss, bossPos);
map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg));
map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossDoor4.js
View File

@@ -50,12 +50,12 @@ function start() {
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
const Point = Java.type('java.awt.Point');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
var boss = MapleLifeFactory.getMonster(bossMobid);
var bossPos = new Point(842, 0);
map.spawnMonsterOnGroundBelow(boss, bossPos);
map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg));
map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossDoor5.js
View File

@@ -50,12 +50,12 @@ function start() {
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
const Point = Java.type('java.awt.Point');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
var boss = MapleLifeFactory.getMonster(bossMobid);
var bossPos = new Point(461, 61);
map.spawnMonsterOnGroundBelow(boss, bossPos);
map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg));
map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossDoor6.js
View File

@@ -50,12 +50,12 @@ function start() {
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
const Point = Java.type('java.awt.Point');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
var boss = MapleLifeFactory.getMonster(bossMobid);
var bossPos = new Point(171, 50);
map.spawnMonsterOnGroundBelow(boss, bossPos);
map.broadcastMessage(MaplePacketCreator.serverNotice(6, bossMsg));
map.broadcastMessage(PacketCreator.serverNotice(6, bossMsg));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossDyle.js
View File

@@ -48,11 +48,11 @@ function start() {
}
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
const Point = Java.type('java.awt.Point');
const spawnpoint = new Point(90, 119);
dangeroudCroko1.spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(6220000), spawnpoint);
dangeroudCroko1.broadcastMessage(MaplePacketCreator.serverNotice(6, "The huge crocodile Dyle has come out from the swamp."));
dangeroudCroko1.broadcastMessage(PacketCreator.serverNotice(6, "The huge crocodile Dyle has come out from the swamp."));
setupTask = em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossEliza1.js
View File

@@ -52,11 +52,11 @@ function start() {
return;
}
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
const Point = Java.type('java.awt.Point');
const spawnpoint = new Point(208, 83);
stairwayToTheSky2.spawnMonsterOnGroundBelow(eliza, spawnpoint);
stairwayToTheSky2.broadcastMessage(MaplePacketCreator.serverNotice(6, "Eliza has appeared with a black whirlwind."));
stairwayToTheSky2.broadcastMessage(PacketCreator.serverNotice(6, "Eliza has appeared with a black whirlwind."));
em.schedule("start", 3 * 60 *60 * 1000);
}

4
scripts/event/AreaBossFaust1.js
View File

@@ -48,13 +48,13 @@ function start() {
}
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
const Point = Java.type('java.awt.Point');
var faust1 = MapleLifeFactory.getMonster(5220002);
const spawnpoint = new Point(456, 278);
theForestOfEvil1.spawnMonsterOnGroundBelow(faust1, spawnpoint);
theForestOfEvil1.broadcastMessage(MaplePacketCreator.serverNotice(6, "Faust appeared amidst the blue fog."));
theForestOfEvil1.broadcastMessage(PacketCreator.serverNotice(6, "Faust appeared amidst the blue fog."));
em.schedule("start", 3 * 60 *60 * 1000);
}

4
scripts/event/AreaBossFaust2.js
View File

@@ -54,8 +54,8 @@ function start() {
const spawnpoint = new Point(474, 278);
theForestOfEvil2.spawnMonsterOnGroundBelow(faust2, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
theForestOfEvil2.broadcastMessage(MaplePacketCreator.serverNotice(6, "Faust appeared amidst the blue fog."));
const PacketCreator = Java.type('tools.PacketCreator');
theForestOfEvil2.broadcastMessage(PacketCreator.serverNotice(6, "Faust appeared amidst the blue fog."));
em.schedule("start", 3 * 60 *60 * 1000);
}

4
scripts/event/AreaBossKimera.js
View File

@@ -57,8 +57,8 @@ function start() {
const spawnpoint = new Point(posX, posY);
labSecretBasementPath.spawnMonsterOnGroundBelow(chimera, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
labSecretBasementPath.broadcastMessage(MaplePacketCreator.serverNotice(6, "Kimera has appeared out of the darkness of the underground with a glitter in her eyes."));
const PacketCreator = Java.type('tools.PacketCreator');
labSecretBasementPath.broadcastMessage(PacketCreator.serverNotice(6, "Kimera has appeared out of the darkness of the underground with a glitter in her eyes."));
em.schedule("start", 3 * 60 *60 * 1000);
}

4
scripts/event/AreaBossKingClang.js
View File

@@ -58,8 +58,8 @@ function start() {
const spawnpoint = new Point(posX, posY);
hotSand.spawnMonsterOnGroundBelow(kingClang, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
hotSand.broadcastMessage(MaplePacketCreator.serverNotice(6, "A strange turban shell has appeared on the beach."));
const PacketCreator = Java.type('tools.PacketCreator');
hotSand.broadcastMessage(PacketCreator.serverNotice(6, "A strange turban shell has appeared on the beach."));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossKingSageCat.js
View File

@@ -56,8 +56,8 @@ function start() {
const spawnpoint = new Point(posX, posY);
goblinForest2.spawnMonsterOnGroundBelow(kingSageCat, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
goblinForest2.broadcastMessage(MaplePacketCreator.serverNotice(6, "The ghostly air around here has become stronger. The unpleasant sound of a cat crying can be heard."));
const PacketCreator = Java.type('tools.PacketCreator');
goblinForest2.broadcastMessage(PacketCreator.serverNotice(6, "The ghostly air around here has become stronger. The unpleasant sound of a cat crying can be heard."));
em.schedule("start", 3 * 60 *60 * 1000);
}

4
scripts/event/AreaBossLeviathan.js
View File

@@ -56,8 +56,8 @@ function start() {
const spawnpoint = new Point(posX, posY);
leviathansCanyon.spawnMonsterOnGroundBelow(leviathan, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
leviathansCanyon.broadcastMessage(MaplePacketCreator.serverNotice(6, "Leviathan emerges from the canyon and the cold icy wind blows."));
const PacketCreator = Java.type('tools.PacketCreator');
leviathansCanyon.broadcastMessage(PacketCreator.serverNotice(6, "Leviathan emerges from the canyon and the cold icy wind blows."));
em.schedule("start", 3 * 60 *60 * 1000);
}

4
scripts/event/AreaBossMano.js
View File

@@ -52,8 +52,8 @@ function start() {
const spawnpoint = new Point(279, -496);
thicketAroundTheBeach3.spawnMonsterOnGroundBelow(mano, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
thicketAroundTheBeach3.broadcastMessage(MaplePacketCreator.serverNotice(6, "A cool breeze was felt when Mano appeared."));
const PacketCreator = Java.type('tools.PacketCreator');
thicketAroundTheBeach3.broadcastMessage(PacketCreator.serverNotice(6, "A cool breeze was felt when Mano appeared."));
em.schedule("start", 3 * 60 *60 * 1000);
}

4
scripts/event/AreaBossNineTailedFox.js
View File

@@ -55,8 +55,8 @@ function start() {
const spawnpoint = new Point(posX, posY);
moonRidge.spawnMonsterOnGroundBelow(nineTailedFox, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
moonRidge.broadcastMessage(MaplePacketCreator.serverNotice(6, "As the moon light dims, a long fox cry can be heard and the presence of the old fox can be felt"));
const PacketCreator = Java.type('tools.PacketCreator');
moonRidge.broadcastMessage(PacketCreator.serverNotice(6, "As the moon light dims, a long fox cry can be heard and the presence of the old fox can be felt"));
em.schedule("start", 3 * 60 *60 * 1000);
}

4
scripts/event/AreaBossSeruf.js
View File

@@ -58,8 +58,8 @@ function start() {
const spawnpoint = new Point(posX, posY);
theSeaweedTower.spawnMonsterOnGroundBelow(seruf, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
theSeaweedTower.broadcastMessage(MaplePacketCreator.serverNotice(6, "A strange shell has appeared from a grove of seaweed"));
const PacketCreator = Java.type('tools.PacketCreator');
theSeaweedTower.broadcastMessage(PacketCreator.serverNotice(6, "A strange shell has appeared from a grove of seaweed"));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossSnackBar.js
View File

@@ -52,11 +52,11 @@ function start() {
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
const Point = Java.type('java.awt.Point');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
var snackBar = MapleLifeFactory.getMonster(8220008);
snackBarMap.spawnMonsterOnGroundBelow(snackBar, new Point(rndPos[0], rndPos[1]));
snackBarMap.broadcastMessage(MaplePacketCreator.serverNotice(6, "Slowly, a suspicious food stand opens up on a strangely remote place."));
snackBarMap.broadcastMessage(PacketCreator.serverNotice(6, "Slowly, a suspicious food stand opens up on a strangely remote place."));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossStumpy.js
View File

@@ -57,8 +57,8 @@ function start() {
const spawnpoint = new Point(posX, posY);
eastRockyMountain5.spawnMonsterOnGroundBelow(stumpy, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
eastRockyMountain5.broadcastMessage(MaplePacketCreator.serverNotice(6, "Stumpy has appeared with a stumping sound that rings the Stone Mountain."));
const PacketCreator = Java.type('tools.PacketCreator');
eastRockyMountain5.broadcastMessage(PacketCreator.serverNotice(6, "Stumpy has appeared with a stumping sound that rings the Stone Mountain."));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossTaeRoon.js
View File

@@ -57,8 +57,8 @@ function start() {
const spawnpoint = new Point(posX, posY);
territoryOfWanderingBear.spawnMonsterOnGroundBelow(taeRoon, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
territoryOfWanderingBear.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tae Roon has appeared with a soft whistling sound."));
const PacketCreator = Java.type('tools.PacketCreator');
territoryOfWanderingBear.broadcastMessage(PacketCreator.serverNotice(6, "Tae Roon has appeared with a soft whistling sound."));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossTimer1.js
View File

@@ -56,8 +56,8 @@ function start() {
const spawnpoint = new Point(posX, posY);
whirlpoolOfTime.spawnMonsterOnGroundBelow(timer1, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
whirlpoolOfTime.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known."));
const PacketCreator = Java.type('tools.PacketCreator');
whirlpoolOfTime.broadcastMessage(PacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known."));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossTimer2.js
View File

@@ -57,8 +57,8 @@ function start() {
const spawnpoint = new Point(posX, posY);
lostTime1.spawnMonsterOnGroundBelow(timer2, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
lostTime1.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known."));
const PacketCreator = Java.type('tools.PacketCreator');
lostTime1.broadcastMessage(PacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known."));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossTimer3.js
View File

@@ -58,8 +58,8 @@ function start() {
const spawnpoint = new Point(posX, posY);
lostTime2.spawnMonsterOnGroundBelow(timer3, spawnpoint);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
lostTime2.broadcastMessage(MaplePacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known."));
const PacketCreator = Java.type('tools.PacketCreator');
lostTime2.broadcastMessage(PacketCreator.serverNotice(6, "Tick-Tock Tick-Tock! Timer makes it's presence known."));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/AreaBossZeno.js
View File

@@ -49,11 +49,11 @@ function start() {
const MapleLifeFactory = Java.type('server.life.MapleLifeFactory');
const Point = Java.type('java.awt.Point');
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
var zeno = MapleLifeFactory.getMonster(6220001);
graysPrairie.spawnMonsterOnGroundBelow(zeno, new Point(-4224, 776));
graysPrairie.broadcastMessage(MaplePacketCreator.serverNotice(6, "Zeno has appeared with a heavy sound of machinery."));
graysPrairie.broadcastMessage(PacketCreator.serverNotice(6, "Zeno has appeared with a heavy sound of machinery."));
em.schedule("start", 3 * 60 * 60 * 1000);
}

4
scripts/event/BalrogQuest.js
View File

@@ -63,8 +63,8 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 1);
em.setProperty("noEntry","true");
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

6
scripts/event/Boats.js
View File

@@ -86,9 +86,9 @@ function approach() {
em.setProperty("haveBalrog","true");
Boat_to_Orbis.broadcastEnemyShip(true);
Boat_to_Ellinia.broadcastEnemyShip(true);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
Boat_to_Orbis.broadcastMessage(MaplePacketCreator.musicChange("Bgm04/ArabPirate"));
Boat_to_Ellinia.broadcastMessage(MaplePacketCreator.musicChange("Bgm04/ArabPirate"));
const PacketCreator = Java.type('tools.PacketCreator');
Boat_to_Orbis.broadcastMessage(PacketCreator.musicChange("Bgm04/ArabPirate"));
Boat_to_Ellinia.broadcastMessage(PacketCreator.musicChange("Bgm04/ArabPirate"));
em.schedule("invasion", invasionDelay);
}

4
scripts/event/DollHouse.js
View File

@@ -46,8 +46,8 @@ function playerEntry(eim, player) {
player.changeMap(entryMap, 0);
em.setProperty("noEntry","true");
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(eventTime * 60));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(eventTime * 60));
eim.startEventTimer(eventTime * 60000);
}

4
scripts/event/Hak.js
View File

@@ -32,8 +32,8 @@ function playerEntry(eim, player) {
onRide = eim.getMapFactory().getMap(birdRide[myRide]);
player.changeMap(onRide, onRide.getPortal(0));
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(rideTime / 1000));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(rideTime / 1000));
eim.schedule("timeOut", rideTime);
}

8
scripts/event/HenesysPQ.js
View File

@@ -250,8 +250,8 @@ function friendlyItemDrop(eim, mob) {
var cakes = eim.getIntProperty("bunnyCake") + 1;
eim.setIntProperty("bunnyCake", cakes);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
mob.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, "The Moon Bunny made rice cake number " + cakes + "."));
const PacketCreator = Java.type('tools.PacketCreator');
mob.getMap().broadcastMessage(PacketCreator.serverNotice(6, "The Moon Bunny made rice cake number " + cakes + "."));
}
}
@@ -259,8 +259,8 @@ function friendlyDamaged(eim, mob) {
if (mob.getId() == 9300061) {
var bunnyDamage = eim.getIntProperty("bunnyDamaged") + 1;
if (bunnyDamage > 5) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
broadcastMessage(MaplePacketCreator.serverNotice(6, "The Moon Bunny is feeling sick. Please protect it so it can make delicious rice cakes."));
const PacketCreator = Java.type('tools.PacketCreator');
broadcastMessage(PacketCreator.serverNotice(6, "The Moon Bunny is feeling sick. Please protect it so it can make delicious rice cakes."));
eim.setIntProperty("bunnyDamaged", 0);
}
}

6
scripts/event/KerningTrain.js
View File

@@ -33,9 +33,9 @@ function playerEntry(eim, player) {
onRide = eim.getMapFactory().getMap(trainRide[myRide]);
player.changeMap(onRide, onRide.getPortal(0));
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getClient().announce(MaplePacketCreator.getClock(rideTime / 1000));
player.getClient().announce(MaplePacketCreator.earnTitleMessage("The next stop is at Kerning " + (myRide == 0 ? "Square" : "Subway") + " Station. The exit is to your left."));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.getClock(rideTime / 1000));
player.sendPacket(PacketCreator.earnTitleMessage("The next stop is at Kerning " + (myRide == 0 ? "Square" : "Subway") + " Station. The exit is to your left."));
eim.schedule("timeOut", rideTime);
}

4
scripts/event/RescueGaga.js
View File

@@ -101,8 +101,8 @@ function playerEntry(eim, player) {
var map = eim.getMapInstance(entryMap);
player.changeMap(map, map.getPortal(0));
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.announce(MaplePacketCreator.showEffect("event/space/start"));
const PacketCreator = Java.type('tools.PacketCreator');
player.sendPacket(PacketCreator.showEffect("event/space/start"));
player.startMapEffect("Please rescue Gaga within the time limit.", 5120027);
}

12
scripts/event/Subway.js
View File

@@ -36,11 +36,11 @@ function stopEntry() {
}
function takeoff() {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
//sound src: https://www.soundjay.com/transportation/metro-door-close-01.mp3
KC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle"));
NLC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle"));
KC_docked.broadcastMessage(PacketCreator.playSound("subway/whistle"));
NLC_docked.broadcastMessage(PacketCreator.playSound("subway/whistle"));
em.setProperty("docked","false");
KC_Waiting.warpEveryone(Subway_to_NLC.getId());
@@ -53,9 +53,9 @@ function arrived() {
Subway_to_NLC.warpEveryone(NLC_docked.getId(), 0);
scheduleNew();
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
KC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle"));
NLC_docked.broadcastMessage(MaplePacketCreator.playSound("subway/whistle"));
const PacketCreator = Java.type('tools.PacketCreator');
KC_docked.broadcastMessage(PacketCreator.playSound("subway/whistle"));
NLC_docked.broadcastMessage(PacketCreator.playSound("subway/whistle"));
}
function cancelSchedule() {}

6
scripts/map/onUserEnter/200090000.js
View File

@@ -5,9 +5,9 @@ function start(ms) {
var map = ms.getClient().getChannelServer().getMapFactory().getMap(mapId);
if(map.getDocked()) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
ms.getClient().announce(MaplePacketCreator.musicChange("Bgm04/ArabPirate"));
ms.getClient().announce(MaplePacketCreator.crogBoatPacket(true));
const PacketCreator = Java.type('tools.PacketCreator');
ms.getClient().sendPacket(PacketCreator.musicChange("Bgm04/ArabPirate"));
ms.getClient().sendPacket(PacketCreator.crogBoatPacket(true));
}
return true;

6
scripts/map/onUserEnter/200090010.js
View File

@@ -5,9 +5,9 @@ function start(ms) {
var map = ms.getClient().getChannelServer().getMapFactory().getMap(mapId);
if(map.getDocked()) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
ms.getClient().announce(MaplePacketCreator.musicChange("Bgm04/ArabPirate"));
ms.getClient().announce(MaplePacketCreator.crogBoatPacket(true));
const PacketCreator = Java.type('tools.PacketCreator');
ms.getClient().sendPacket(PacketCreator.musicChange("Bgm04/ArabPirate"));
ms.getClient().sendPacket(PacketCreator.crogBoatPacket(true));
}
return true;

4
scripts/npc/1022101_old.js
View File

@@ -136,8 +136,8 @@ function action(mode, type, selection) {
cm.gainItem(itemToUse, -1);
cm.getPlayer().getCashShop().gainCash(1, nxAmount);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
cm.getPlayer().announce(MaplePacketCreator.earnTitleMessage("You have earned " + nxAmount + " NX"));
const PacketCreator = Java.type('tools.PacketCreator');
cm.getPlayer().sendPacket(PacketCreator.earnTitleMessage("You have earned " + nxAmount + " NX"));
cm.logLeaf(nxAmount + " NX");
cm.dispose();
} else if(choice == 2) {

4
scripts/npc/1061014.js
View File

@@ -156,8 +156,8 @@ function action(mode, type, selection) {
cm.sendOk("The expedition will begin and you will now be escorted to the #b" + expedMap + "#k.");
status = 4;
} else if (selection == 3) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
const PacketCreator = Java.type('tools.PacketCreator');
player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
cm.endExpedition(expedition);
cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away.");
cm.dispose();

12
scripts/npc/2012027.js
View File

@@ -45,8 +45,8 @@ function action(mode, type, selection) {
status--;
if(status == 0) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
const PacketCreator = Java.type('tools.PacketCreator');
cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
if(cm.isQuestStarted(3114)) {
var idx = -1 * cm.getQuestProgressInt(3114); // infoEx without infoNumber, must use one progress only, critical hit!
@@ -57,8 +57,8 @@ function action(mode, type, selection) {
if(harpNote != nextNote) {
cm.setQuestProgress(3114, 0);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Failed"));
cm.message("You've missed the note... Start over again.");
} else {
@@ -71,8 +71,8 @@ function action(mode, type, selection) {
cm.message("Twinkle, twinkle, little star, how I wonder what you are.");
cm.setQuestProgress(3114, 42);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Clear"));
cm.dispose();
return;

12
scripts/npc/2012028.js
View File

@@ -45,8 +45,8 @@ function action(mode, type, selection) {
status--;
if(status == 0) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
const PacketCreator = Java.type('tools.PacketCreator');
cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
if(cm.isQuestStarted(3114)) {
var idx = -1 * cm.getQuestProgressInt(3114);
@@ -57,8 +57,8 @@ function action(mode, type, selection) {
if(harpNote != nextNote) {
cm.setQuestProgress(3114, 0);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Failed"));
cm.message("You've missed the note... Start over again.");
} else {
@@ -71,8 +71,8 @@ function action(mode, type, selection) {
cm.message("Twinkle, twinkle, little star, how I wonder what you are.");
cm.setQuestProgress(3114, 42);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Clear"));
cm.dispose();
return;

12
scripts/npc/2012029.js
View File

@@ -45,8 +45,8 @@ function action(mode, type, selection) {
status--;
if(status == 0) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
const PacketCreator = Java.type('tools.PacketCreator');
cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
if(cm.isQuestStarted(3114)) {
var idx = -1 * cm.getQuestProgressInt(3114);
@@ -57,8 +57,8 @@ function action(mode, type, selection) {
if(harpNote != nextNote) {
cm.setQuestProgress(3114, 0);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Failed"));
cm.message("You've missed the note... Start over again.");
} else {
@@ -71,8 +71,8 @@ function action(mode, type, selection) {
cm.message("Twinkle, twinkle, little star, how I wonder what you are.");
cm.setQuestProgress(3114, 42);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Clear"));
cm.dispose();
return;

12
scripts/npc/2012030.js
View File

@@ -45,8 +45,8 @@ function action(mode, type, selection) {
status--;
if(status == 0) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
const PacketCreator = Java.type('tools.PacketCreator');
cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
if(cm.isQuestStarted(3114)) {
var idx = -1 * cm.getQuestProgressInt(3114);
@@ -57,8 +57,8 @@ function action(mode, type, selection) {
if(harpNote != nextNote) {
cm.setQuestProgress(3114, 0);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Failed"));
cm.message("You've missed the note... Start over again.");
} else {
@@ -71,8 +71,8 @@ function action(mode, type, selection) {
cm.message("Twinkle, twinkle, little star, how I wonder what you are.");
cm.setQuestProgress(3114, 42);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Clear"));
cm.dispose();
return;

12
scripts/npc/2012031.js
View File

@@ -45,8 +45,8 @@ function action(mode, type, selection) {
status--;
if(status == 0) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
const PacketCreator = Java.type('tools.PacketCreator');
cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
if(cm.isQuestStarted(3114)) {
var idx = -1 * cm.getQuestProgressInt(3114);
@@ -57,8 +57,8 @@ function action(mode, type, selection) {
if(harpNote != nextNote) {
cm.setQuestProgress(3114, 0);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Failed"));
cm.message("You've missed the note... Start over again.");
} else {
@@ -71,8 +71,8 @@ function action(mode, type, selection) {
cm.message("Twinkle, twinkle, little star, how I wonder what you are.");
cm.setQuestProgress(3114, 42);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Clear"));
cm.dispose();
return;

12
scripts/npc/2012032.js
View File

@@ -45,8 +45,8 @@ function action(mode, type, selection) {
status--;
if(status == 0) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
const PacketCreator = Java.type('tools.PacketCreator');
cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
if(cm.isQuestStarted(3114)) {
var idx = -1 * cm.getQuestProgressInt(3114);
@@ -57,8 +57,8 @@ function action(mode, type, selection) {
if(harpNote != nextNote) {
cm.setQuestProgress(3114, 0);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Failed"));
cm.message("You've missed the note... Start over again.");
} else {
@@ -71,8 +71,8 @@ function action(mode, type, selection) {
cm.message("Twinkle, twinkle, little star, how I wonder what you are.");
cm.setQuestProgress(3114, 42);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Clear"));
cm.dispose();
return;

12
scripts/npc/2012033.js
View File

@@ -45,8 +45,8 @@ function action(mode, type, selection) {
status--;
if(status == 0) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
cm.getMap().broadcastMessage(MaplePacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
const PacketCreator = Java.type('tools.PacketCreator');
cm.getMap().broadcastMessage(PacketCreator.playSound("orbis/" + harpSounds[cm.getNpc() - 2012027]));
if(cm.isQuestStarted(3114)) {
var idx = -1 * cm.getQuestProgressInt(3114);
@@ -57,8 +57,8 @@ function action(mode, type, selection) {
if(harpNote != nextNote) {
cm.setQuestProgress(3114, 0);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Failed"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/wrong_kor"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Failed"));
cm.message("You've missed the note... Start over again.");
} else {
@@ -71,8 +71,8 @@ function action(mode, type, selection) {
cm.message("Twinkle, twinkle, little star, how I wonder what you are.");
cm.setQuestProgress(3114, 42);
cm.getPlayer().announce(MaplePacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().announce(MaplePacketCreator.playSound("Party1/Clear"));
cm.getPlayer().sendPacket(PacketCreator.showEffect("quest/party/clear"));
cm.getPlayer().sendPacket(PacketCreator.playSound("Party1/Clear"));
cm.dispose();
return;

4
scripts/npc/2030013.js
View File

@@ -159,8 +159,8 @@ function action(mode, type, selection) {
cm.sendOk("The expedition will begin and you will now be escorted to the #b" + expedMap + "#k.");
status = 4;
} else if (selection == 3) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
const PacketCreator = Java.type('tools.PacketCreator');
player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
cm.endExpedition(expedition);
cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away.");
cm.dispose();

4
scripts/npc/2083004.js
View File

@@ -151,8 +151,8 @@ function action(mode, type, selection) {
cm.sendOk("Good luck! All of Leafre is counting on you.");
status = 4;
} else if (selection == 3) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
const PacketCreator = Java.type('tools.PacketCreator');
player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
cm.endExpedition(expedition);
cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away.");
cm.dispose();

4
scripts/npc/2141001.js
View File

@@ -154,8 +154,8 @@ function action(mode, type, selection) {
cm.sendOk("The expedition will begin and you will now be escorted to the #b" + expedMap + "#k.");
status = 4;
} else if (selection == 3) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
const PacketCreator = Java.type('tools.PacketCreator');
player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
cm.endExpedition(expedition);
cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away.");
cm.dispose();

4
scripts/npc/9000019.js
View File

@@ -26,8 +26,8 @@ function action(mode, type, selection) {
return;
}
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
cm.getClient().announce(MaplePacketCreator.openRPSNPC());
const PacketCreator = Java.type('tools.PacketCreator');
cm.getClient().sendPacket(PacketCreator.openRPSNPC());
cm.dispose();
}
}

4
scripts/npc/9120201.js
View File

@@ -158,8 +158,8 @@ function action(mode, type, selection) {
cm.sendOk("The expedition will begin and you will now be escorted to the #b" + expedMap + "#k.");
status = 4;
} else if (selection == 3) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
const PacketCreator = Java.type('tools.PacketCreator');
player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
cm.endExpedition(expedition);
cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away.");
cm.dispose();

18
scripts/npc/9201002.js
View File

@@ -300,19 +300,19 @@ function action(mode, type, selection) {
if (state == 0) { // give player blessings
eim.gridInsert(cm.getPlayer(), 1);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
if (YamlConfig.config.server.WEDDING_BLESSER_SHOWFX) {
var target = cm.getPlayer();
target.announce(MaplePacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false);
target.sendPacket(PacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false);
} else {
var target = eim.getPlayerById(eim.getIntProperty("groomId"));
target.announce(MaplePacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false);
target.sendPacket(PacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false);
target = eim.getPlayerById(eim.getIntProperty("brideId"));
target.announce(MaplePacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false);
target.sendPacket(PacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false);
}
cm.sendOk("Your blessings have been added to their love. What a noble act for a lovely couple!");
@@ -357,8 +357,8 @@ function action(mode, type, selection) {
partner.setMarriageItemId(marriageRingId);
//var marriageId = eim.getIntProperty("weddingId");
//player.announce(Wedding.OnMarriageResult(marriageId, player, true));
//partner.announce(Wedding.OnMarriageResult(marriageId, player, true));
//player.sendPacket(Wedding.OnMarriageResult(marriageId, player, true));
//partner.sendPacket(Wedding.OnMarriageResult(marriageId, player, true));
giveCoupleBlessings(eim, player, partner);

18
scripts/npc/9201011.js
View File

@@ -170,19 +170,19 @@ function action(mode, type, selection) {
if(state == 0) { // give player blessings
eim.gridInsert(cm.getPlayer(), 1);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
if(YamlConfig.config.server.WEDDING_BLESSER_SHOWFX) {
var target = cm.getPlayer();
target.announce(MaplePacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false);
target.sendPacket(PacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false);
} else {
var target = eim.getPlayerById(eim.getIntProperty("groomId"));
target.announce(MaplePacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false);
target.sendPacket(PacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false);
target = eim.getPlayerById(eim.getIntProperty("brideId"));
target.announce(MaplePacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, MaplePacketCreator.showForeignEffect(target.getId(), 9), false);
target.sendPacket(PacketCreator.showSpecialEffect(9));
target.getMap().broadcastMessage(target, PacketCreator.showForeignEffect(target.getId(), 9), false);
}
cm.sendOk("Way to go, my friend! Your LOVE has been added to theirs, now in one bigger heart-shaped sentiment that will remain lively in our hearts forever! Who-hoo~!");
@@ -227,8 +227,8 @@ function action(mode, type, selection) {
partner.setMarriageItemId(marriageRingId);
//var marriageId = eim.getIntProperty("weddingId");
//player.announce(Wedding.OnMarriageResult(marriageId, player, true));
//partner.announce(Wedding.OnMarriageResult(marriageId, player, true));
//player.sendPacket(Wedding.OnMarriageResult(marriageId, player, true));
//partner.sendPacket(Wedding.OnMarriageResult(marriageId, player, true));
giveCoupleBlessings(eim, player, partner);

4
scripts/npc/9201113.js
View File

@@ -141,8 +141,8 @@ function action(mode, type, selection) {
cm.sendOk("The expedition will begin and you will now be escorted to the #bEntrance to CWKPQ Altar#k.");
status = 4;
} else if (selection == 3) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
const PacketCreator = Java.type('tools.PacketCreator');
player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
cm.endExpedition(expedition);
cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away.");
cm.dispose();

4
scripts/npc/9270047.js
View File

@@ -158,8 +158,8 @@ function action(mode, type, selection) {
cm.sendOk("The expedition will begin and you will now be escorted to the #b" + expedMap + "#k.");
status = 4;
} else if (selection == 3) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
player.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
const PacketCreator = Java.type('tools.PacketCreator');
player.getMap().broadcastMessage(PacketCreator.serverNotice(6, expedition.getLeader().getName() + " has ended the expedition."));
cm.endExpedition(expedition);
cm.sendOk("The expedition has now ended. Sometimes the best strategy is to run away.");
cm.dispose();

12
scripts/npc/9977777.js
View File

@@ -308,21 +308,21 @@ function writeAllFeatures() {
}
function start() {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
cm.getPlayer().announce(MaplePacketCreator.musicChange(anthemSong));
const PacketCreator = Java.type('tools.PacketCreator');
cm.getPlayer().sendPacket(PacketCreator.musicChange(anthemSong));
status = -1;
writeAllFeatures();
action(1, 0, 0);
}
function action(mode, type, selection) {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
if (mode == -1) {
cm.getPlayer().announce(MaplePacketCreator.musicChange(ambientSong));
cm.getPlayer().sendPacket(PacketCreator.musicChange(ambientSong));
cm.dispose();
} else {
if (mode == 0 && type > 0) {
cm.getPlayer().announce(MaplePacketCreator.musicChange(ambientSong));
cm.getPlayer().sendPacket(PacketCreator.musicChange(ambientSong));
cm.dispose();
return;
}
@@ -356,7 +356,7 @@ function action(mode, type, selection) {
cm.sendPrev(sendStr);
} else {
cm.getPlayer().announce(MaplePacketCreator.musicChange(ambientSong));
cm.getPlayer().sendPacket(PacketCreator.musicChange(ambientSong));
cm.dispose();
}
}

4
scripts/npc/MagatiaPassword.js
View File

@@ -21,8 +21,8 @@ function action(mode, type, selection){
else if(status == 1){
if(cm.getText() == cm.getQuestProgress(3360)){
cm.setQuestProgress(3360, 1);
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
cm.getPlayer().announce(MaplePacketCreator.playPortalSound());
const PacketCreator = Java.type('tools.PacketCreator');
cm.getPlayer().sendPacket(PacketCreator.playPortalSound());
cm.warp(261030000, "sp_" + ((cm.getMapId() == 261010000) ? "jenu" : "alca"));
}
else {

10
scripts/portal/party3_jailin.js
View File

@@ -28,17 +28,17 @@ function enterLeverSequence(pi) {
}
}
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
if(countMiss > 0) {
map.broadcastMessage(MaplePacketCreator.showEffect("quest/party/wrong_kor"));
map.broadcastMessage(MaplePacketCreator.playSound("Party1/Failed"));
map.broadcastMessage(PacketCreator.showEffect("quest/party/wrong_kor"));
map.broadcastMessage(PacketCreator.playSound("Party1/Failed"));
pi.playerMessage(5, "The right combination of levers is needed to pass. " + countMiss + " lever(s) are misplaced.");
return false;
}
map.broadcastMessage(MaplePacketCreator.showEffect("quest/party/clear"));
map.broadcastMessage(MaplePacketCreator.playSound("Party1/Clear"));
map.broadcastMessage(PacketCreator.showEffect("quest/party/clear"));
map.broadcastMessage(PacketCreator.playSound("Party1/Clear"));
pi.getEventInstance().setProperty("jail" + jailn, "0");
}

6
scripts/reactor/9101000.js
View File

@@ -29,11 +29,11 @@
*/
function act() {
const MaplePacketCreator = Java.type('tools.MaplePacketCreator');
const PacketCreator = Java.type('tools.PacketCreator');
rm.spawnMonster(9300061, 1, 0, 0); // (0, 0) is temp position
rm.getClient().getMap().startMapEffect("Protect the Moon Bunny that's pounding the mill, and gather up 10 Moon Bunny's Rice Cakes!", 5120016, 7000);
rm.getClient().getMap().broadcastMessage(MaplePacketCreator.bunnyPacket()); // Protect the Moon Bunny!
rm.getClient().getMap().broadcastMessage(MaplePacketCreator.showHPQMoon());
rm.getClient().getMap().broadcastMessage(PacketCreator.bunnyPacket()); // Protect the Moon Bunny!
rm.getClient().getMap().broadcastMessage(PacketCreator.showHPQMoon());
rm.getClient().getMap().showAllMonsters();
}

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

@@ -21,9 +21,10 @@
*/
package client;
import net.packet.Packet;
import net.server.PlayerStorage;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -126,12 +127,12 @@ public class BuddyList {
}
}
public void broadcast(byte[] packet, PlayerStorage pstorage) {
public void broadcast(Packet packet, PlayerStorage pstorage) {
for(int bid : getBuddyIds()) {
MapleCharacter chr = pstorage.getCharacterById(bid);
if(chr != null && chr.isLoggedinWorld()) {
chr.announce(packet);
chr.sendPacket(packet);
}
}
}
@@ -167,7 +168,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.sendPacket(PacketCreator.requestBuddylistAdd(cidFrom, c.getPlayer().getId(), nameFrom));
} else {
pendingRequests.push(new CharacterNameAndId(cidFrom, nameFrom));
}

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

File diff suppressed because it is too large Load Diff

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

@@ -30,11 +30,10 @@ import io.netty.handler.timeout.IdleStateEvent;
import net.MaplePacketHandler;
import net.PacketProcessor;
import net.netty.InvalidPacketHeaderException;
import net.packet.InPacket;
import net.packet.Packet;
import net.packet.logging.LoggingUtil;
import net.packet.logging.MapleLogger;
import net.packet.ByteBufOutPacket;
import net.packet.InPacket;
import net.packet.OutPacket;
import net.server.Server;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
@@ -44,6 +43,7 @@ import net.server.coordinator.session.Hwid;
import net.server.coordinator.session.IpAddresses;
import net.server.coordinator.session.SessionCoordinator;
import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult;
import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter;
import net.server.world.*;
@@ -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.sendPacket(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.sendPacket(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.sendPacket(GuildPackets.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());
sendPacket(PacketCreator.getPing());
TimerManager.getInstance().schedule(() -> {
try {
if (lastPong < pingedAt) {
@@ -1414,15 +1414,15 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
private void announceDisableServerMessage() {
if (!this.getWorldServer().registerDisabledServerMessage(player.getId())) {
announce(MaplePacketCreator.serverMessage(""));
sendPacket(PacketCreator.serverMessage(""));
}
}
public void announceServerMessage() {
announce(MaplePacketCreator.serverMessage(this.getChannelServer().getServerMessage()));
sendPacket(PacketCreator.serverMessage(this.getChannelServer().getServerMessage()));
}
public synchronized void announceBossHpBar(MapleMonster mm, final int mobHash, final byte[] packet) {
public synchronized void announceBossHpBar(MapleMonster mm, final int mobHash, Packet packet) {
long timeNow = System.currentTimeMillis();
int targetHash = player.getTargetHpBarHash();
@@ -1430,55 +1430,31 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
if (timeNow - player.getTargetHpBarTime() >= 5 * 1000) {
// is there a way to INTERRUPT this annoying thread running on the client that drops the boss bar after some time at every attack?
announceDisableServerMessage();
announce(packet);
sendPacket(packet);
player.setTargetHpBarHash(mobHash);
player.setTargetHpBarTime(timeNow);
}
} else {
announceDisableServerMessage();
announce(packet);
sendPacket(packet);
player.setTargetHpBarTime(timeNow);
}
}
@Deprecated(forRemoval = true, since = "Netty migration")
public void announce(final byte[] packet) { // thanks GitGud for noticing an opportunity for improvement by overcoming "synchronized announce"
public void sendPacket(Packet packet) {
announcerLock.lock();
try {
// session.write(packet);
sendPacket(packet);
} finally {
announcerLock.unlock();
}
}
// Workaround for old packets. All uses of Client#announce(byte[]) should be migrated to Client#sendPacket(OutPacket)
private void sendPacket(final byte[] packet) {
announcerLock.lock();
try {
OutPacket outPacket = new ByteBufOutPacket();
outPacket.writeBytes(packet);
ioChannel.writeAndFlush(outPacket);
} finally {
announcerLock.unlock();
}
}
public void sendPacket(OutPacket outPacket) {
announcerLock.lock();
try {
ioChannel.writeAndFlush(outPacket.getBytes());
ioChannel.writeAndFlush(packet);
} finally {
announcerLock.unlock();
}
}
public void announceHint(String msg, int length) {
announce(MaplePacketCreator.sendHint(msg, length, 10));
announce(MaplePacketCreator.enableActions());
sendPacket(PacketCreator.sendHint(msg, length, 10));
sendPacket(PacketCreator.enableActions());
}
public void changeChannel(int channel) {
@@ -1488,18 +1464,18 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
return;
}
if (!player.isAlive() || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
announce(MaplePacketCreator.enableActions());
sendPacket(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());
sendPacket(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
sendPacket(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());
sendPacket(PacketCreator.serverNotice(1, "Channel " + channel + " is currently disabled. Try another channel."));
sendPacket(PacketCreator.enableActions());
return;
}
@@ -1530,7 +1506,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
player.setSessionTransitionState();
try {
announce(MaplePacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
sendPacket(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
} catch (IOException e) {
e.printStackTrace();
}
@@ -1586,7 +1562,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
}
public void enableCSActions() {
announce(MaplePacketCreator.enableCSUse(player));
sendPacket(PacketCreator.enableCSUse(player));
}
public boolean canBypassPin() {

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

@@ -21,11 +21,12 @@
*/
package client;
import net.packet.Packet;
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;
@@ -151,16 +152,16 @@ public class MapleFamily {
return members.get(cid);
}
public void broadcast(byte[] packet) {
public void broadcast(Packet packet) {
broadcast(packet, -1);
}
public void broadcast(byte[] packet, int ignoreID) {
public void broadcast(Packet packet, int ignoreID) {
for(MapleFamilyEntry entry : members.values()) {
MapleCharacter chr = entry.getChr();
if(chr != null) {
if(chr.getId() == ignoreID) continue;
chr.getClient().announce(packet);
chr.sendPacket(packet);
}
}
}
@@ -169,7 +170,7 @@ public class MapleFamily {
for(MapleFamilyEntry entry : members.values()) {
MapleCharacter chr = entry.getChr();
if(chr != null) {
chr.getClient().announce(MaplePacketCreator.getFamilyInfo(entry));
chr.sendPacket(PacketCreator.getFamilyInfo(entry));
}
}
}

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

@@ -19,6 +19,13 @@
*/
package client;
import net.packet.Packet;
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 +33,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 +265,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.sendPacket(PacketCreator.sendGainRep(gain, from != null ? from.getName() : ""));
}
public void giveReputationToSenior(int gain, boolean includeSuperSenior) {
@@ -420,15 +421,15 @@ public class MapleFamilyEntry {
this.totalJuniors = totalJuniors;
}
public void announceToSenior(byte[] packet, boolean includeSuperSenior) {
public void announceToSenior(Packet packet, boolean includeSuperSenior) {
MapleFamilyEntry senior = getSenior();
if(senior != null) {
MapleCharacter seniorChr = senior.getChr();
if(seniorChr != null) seniorChr.announce(packet);
if(seniorChr != null) seniorChr.sendPacket(packet);
senior = senior.getSenior();
if(includeSuperSenior && senior != null) {
seniorChr = senior.getChr();
if(seniorChr != null) seniorChr.announce(packet);
if(seniorChr != null) seniorChr.sendPacket(packet);
}
}
}
@@ -437,11 +438,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.sendPacket(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.sendPacket(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.sendPacket(PacketCreator.addCard(false, cardid, qty + 1));
c.sendPacket(PacketCreator.showGainCard());
} else {
c.announce(MaplePacketCreator.addCard(true, cardid, 5));
c.sendPacket(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.sendPacket(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 net.server.guild.GuildPackets;
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.sendPacket(GuildPackets.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.sendPacket(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.sendPacket(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.sendPacket(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.sendPacket(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.sendPacket(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.sendPacket(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));
}
}
}

9
src/main/java/client/command/commands/gm3/PeCommand.java
View File

@@ -28,12 +28,13 @@ import client.MapleClient;
import client.command.Command;
import net.MaplePacketHandler;
import net.PacketProcessor;
import net.packet.ByteBufOutPacket;
import net.packet.OutPacket;
import tools.FilePrinter;
import tools.HexTool;
import tools.data.input.ByteArrayByteStream;
import tools.data.input.GenericSeekableLittleEndianAccessor;
import tools.data.input.SeekableLittleEndianAccessor;
import tools.data.output.MaplePacketLittleEndianWriter;
import java.io.FileReader;
import java.io.IOException;
@@ -61,9 +62,9 @@ public class PeCommand extends Command {
return;
}
MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.write(HexTool.getByteArrayFromHexString(packet));
SeekableLittleEndianAccessor slea = new GenericSeekableLittleEndianAccessor(new ByteArrayByteStream(mplew.getPacket()));
OutPacket p = new ByteBufOutPacket();
p.writeBytes(HexTool.getByteArrayFromHexString(packet));
SeekableLittleEndianAccessor slea = new GenericSeekableLittleEndianAccessor(new ByteArrayByteStream(p.getBytes()));
short packetId = slea.readShort();
final MaplePacketHandler packetHandler = PacketProcessor.getProcessor(0, c.getChannel()).getHandler(packetId);
if (packetHandler != null && packetHandler.validateState(c)) {

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.sendPacket(PacketCreator.removeClock());
}
} else {
try {
int seconds = Integer.parseInt(params[0]);
for (MapleCharacter victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) {
victim.announce(MaplePacketCreator.getClock(seconds));
victim.sendPacket(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.sendPacket(PacketCreator.removeClock());
} else {
try {
victim.announce(MaplePacketCreator.getClock(Integer.parseInt(params[1])));
victim.sendPacket(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.sendPacket(PacketCreator.removeClock());
}
} else {
try {
int seconds = Integer.parseInt(params[0]);
for (MapleCharacter victim : player.getMap().getCharacters()) {
victim.announce(MaplePacketCreator.getClock(seconds));
victim.sendPacket(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();
}

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