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

2
src/main/java/server/MapleItemInformationProvider.java
View File

@@ -1668,7 +1668,7 @@ public class MapleItemInformationProvider {
if (!EquipSlot.getFromTextSlot(islot).isAllowed(dst, isCash(id))) {
equip.wear(false);
String itemName = MapleItemInformationProvider.getInstance().getName(equip.getItemId());
Server.getInstance().broadcastGMMessage(chr.getWorld(), MaplePacketCreator.sendYellowTip("[Warning]: " + chr.getName() + " tried to equip " + itemName + " into slot " + dst + "."));
Server.getInstance().broadcastGMMessage(chr.getWorld(), PacketCreator.sendYellowTip("[Warning]: " + chr.getName() + " tried to equip " + itemName + " into slot " + dst + "."));
AutobanFactory.PACKET_EDIT.alert(chr, chr.getName() + " tried to forcibly equip an item.");
FilePrinter.printError(FilePrinter.EXPLOITS + chr.getName() + ".txt", chr.getName() + " tried to equip " + itemName + " into " + dst + " slot.");
return false;

28
src/main/java/server/MapleShop.java
View File

@@ -28,7 +28,7 @@ import client.inventory.MaplePet;
import client.inventory.manipulator.MapleInventoryManipulator;
import constants.inventory.ItemConstants;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -76,7 +76,7 @@ public class MapleShop {
public void sendShop(MapleClient c) {
c.getPlayer().setShop(this);
c.announce(MaplePacketCreator.getNPCShop(c, getNpcId(), items));
c.announce(PacketCreator.getNPCShop(c, getNpcId(), items));
}
public void buy(MapleClient c, short slot, int itemId, short quantity) {
@@ -103,12 +103,12 @@ public class MapleShop {
MapleInventoryManipulator.addById(c, itemId, quantity, "", -1);
c.getPlayer().gainMeso(-item.getPrice(), false);
}
c.announce(MaplePacketCreator.shopTransaction((byte) 0));
c.announce(PacketCreator.shopTransaction((byte) 0));
} else
c.announce(MaplePacketCreator.shopTransaction((byte) 3));
c.announce(PacketCreator.shopTransaction((byte) 3));
} else
c.announce(MaplePacketCreator.shopTransaction((byte) 2));
c.announce(PacketCreator.shopTransaction((byte) 2));
} else if (item.getPitch() > 0) {
int amount = (int)Math.min((float) item.getPitch() * quantity, Integer.MAX_VALUE);
@@ -124,9 +124,9 @@ public class MapleShop {
MapleInventoryManipulator.addById(c, itemId, quantity, "", -1);
MapleInventoryManipulator.removeById(c, MapleInventoryType.ETC, 4310000, amount, false, false);
}
c.announce(MaplePacketCreator.shopTransaction((byte) 0));
c.announce(PacketCreator.shopTransaction((byte) 0));
} else
c.announce(MaplePacketCreator.shopTransaction((byte) 3));
c.announce(PacketCreator.shopTransaction((byte) 3));
}
} else if (c.getPlayer().getInventory(MapleInventoryType.CASH).countById(token) != 0) {
@@ -145,11 +145,11 @@ public class MapleShop {
}
c.getPlayer().gainMeso(diff, false);
} else {
c.announce(MaplePacketCreator.shopTransaction((byte) 3));
c.announce(PacketCreator.shopTransaction((byte) 3));
}
c.announce(MaplePacketCreator.shopTransaction((byte) 0));
c.announce(PacketCreator.shopTransaction((byte) 0));
} else {
c.announce(MaplePacketCreator.shopTransaction((byte) 2));
c.announce(PacketCreator.shopTransaction((byte) 2));
}
}
}
@@ -203,9 +203,9 @@ public class MapleShop {
if (recvMesos > 0) {
c.getPlayer().gainMeso(recvMesos, false);
}
c.announce(MaplePacketCreator.shopTransaction((byte) 0x8));
c.announce(PacketCreator.shopTransaction((byte) 0x8));
} else {
c.announce(MaplePacketCreator.shopTransaction((byte) 0x5));
c.announce(PacketCreator.shopTransaction((byte) 0x5));
}
}
@@ -225,9 +225,9 @@ public class MapleShop {
item.setQuantity(slotMax);
c.getPlayer().forceUpdateItem(item);
c.getPlayer().gainMeso(-price, false, true, false);
c.announce(MaplePacketCreator.shopTransaction((byte) 0x8));
c.announce(PacketCreator.shopTransaction((byte) 0x8));
} else {
c.announce(MaplePacketCreator.shopTransaction((byte) 0x2));
c.announce(PacketCreator.shopTransaction((byte) 0x2));
}
}
}

58
src/main/java/server/MapleStatEffect.java
View File

@@ -43,7 +43,7 @@ import server.maps.*;
import server.partyquest.MapleCarnivalFactory;
import server.partyquest.MapleCarnivalFactory.MCSkill;
import tools.ArrayMap;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.awt.*;
@@ -826,8 +826,8 @@ public class MapleStatEffect {
if (absorbMp > 0) {
mob.setMp(mob.getMp() - absorbMp);
applyto.addMP(absorbMp);
applyto.announce(MaplePacketCreator.showOwnBuffEffect(sourceid, 1));
applyto.getMap().broadcastMessage(applyto, MaplePacketCreator.showBuffeffect(applyto.getId(), sourceid, 1), false);
applyto.announce(PacketCreator.showOwnBuffEffect(sourceid, 1));
applyto.getMap().broadcastMessage(applyto, PacketCreator.showBuffeffect(applyto.getId(), sourceid, 1), false);
}
}
break;
@@ -875,7 +875,7 @@ public class MapleStatEffect {
if (primary) {
if (itemConNo != 0) {
if (!applyto.getAbstractPlayerInteraction().hasItem(itemCon, itemConNo)) {
applyto.announce(MaplePacketCreator.enableActions());
applyto.announce(PacketCreator.enableActions());
return false;
}
MapleInventoryManipulator.removeById(applyto.getClient(), ItemConstants.getInventoryType(itemCon), itemCon, itemConNo, false, true);
@@ -899,7 +899,7 @@ public class MapleStatEffect {
} */
if (!applyto.applyHpMpChange(hpCon, hpchange, mpchange)) {
applyto.announce(MaplePacketCreator.enableActions());
applyto.announce(PacketCreator.enableActions());
return false;
}
@@ -970,7 +970,7 @@ public class MapleStatEffect {
applyto.cancelBuffStats(MapleBuffStat.SUMMON);
}
applyto.announce(MaplePacketCreator.enableActions());
applyto.announce(PacketCreator.enableActions());
}
applyBuffEffect(applyfrom, applyto, primary);
@@ -1108,8 +1108,8 @@ public class MapleStatEffect {
affectedc += affectedp.size(); // used for heal
for (MapleCharacter affected : affectedp) {
applyTo(applyfrom, affected, false, null, useMaxRange, affectedc);
affected.announce(MaplePacketCreator.showOwnBuffEffect(sourceid, 2));
affected.getMap().broadcastMessage(affected, MaplePacketCreator.showBuffeffect(affected.getId(), sourceid, 2), false);
affected.announce(PacketCreator.showOwnBuffEffect(sourceid, 2));
affected.getMap().broadcastMessage(affected, PacketCreator.showBuffeffect(affected.getId(), sourceid, 2), false);
}
}
@@ -1182,7 +1182,7 @@ public class MapleStatEffect {
public final void applyComboBuff(final MapleCharacter applyto, int combo) {
final List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.ARAN_COMBO, combo));
applyto.announce(MaplePacketCreator.giveBuff(sourceid, 99999, stat));
applyto.announce(PacketCreator.giveBuff(sourceid, 99999, stat));
final long starttime = Server.getInstance().getCurrentTime();
// final CancelEffectAction cancelAction = new CancelEffectAction(applyto, this, starttime);
@@ -1192,7 +1192,7 @@ public class MapleStatEffect {
public final void applyBeaconBuff(final MapleCharacter applyto, int objectid) { // thanks Thora & Hyun for reporting an issue with homing beacon autoflagging mobs when changing maps
final List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.HOMING_BEACON, objectid));
applyto.announce(MaplePacketCreator.giveBuff(1, sourceid, stat));
applyto.announce(PacketCreator.giveBuff(1, sourceid, stat));
final long starttime = Server.getInstance().getCurrentTime();
applyto.registerEffect(this, starttime, Long.MAX_VALUE, false);
@@ -1205,9 +1205,9 @@ public class MapleStatEffect {
long leftDuration = (starttime + localDuration) - Server.getInstance().getCurrentTime();
if (leftDuration > 0) {
if (isDash() || isInfusion()) {
target.announce(MaplePacketCreator.givePirateBuff(activeStats, (skill ? sourceid : -sourceid), (int) leftDuration));
target.announce(PacketCreator.givePirateBuff(activeStats, (skill ? sourceid : -sourceid), (int) leftDuration));
} else {
target.announce(MaplePacketCreator.giveBuff((skill ? sourceid : -sourceid), (int) leftDuration, activeStats));
target.announce(PacketCreator.giveBuff((skill ? sourceid : -sourceid), (int) leftDuration, activeStats));
}
}
}
@@ -1260,35 +1260,35 @@ public class MapleStatEffect {
}
if (primary) {
localDuration = alchemistModifyVal(applyfrom, localDuration, false);
applyto.getMap().broadcastMessage(applyto, MaplePacketCreator.showBuffeffect(applyto.getId(), sourceid, 1, (byte) 3), false);
applyto.getMap().broadcastMessage(applyto, PacketCreator.showBuffeffect(applyto.getId(), sourceid, 1, (byte) 3), false);
}
if (localstatups.size() > 0) {
byte[] buff = null;
byte[] mbuff = null;
if (this.isActive(applyto)) {
buff = MaplePacketCreator.giveBuff((skill ? sourceid : -sourceid), localDuration, localstatups);
buff = PacketCreator.giveBuff((skill ? sourceid : -sourceid), localDuration, localstatups);
}
if (isDash()) {
buff = MaplePacketCreator.givePirateBuff(statups, sourceid, seconds);
mbuff = MaplePacketCreator.giveForeignPirateBuff(applyto.getId(), sourceid, seconds, localstatups);
buff = PacketCreator.givePirateBuff(statups, sourceid, seconds);
mbuff = PacketCreator.giveForeignPirateBuff(applyto.getId(), sourceid, seconds, localstatups);
} else if (isWkCharge()) {
mbuff = MaplePacketCreator.giveForeignWKChargeEffect(applyto.getId(), sourceid, localstatups);
mbuff = PacketCreator.giveForeignWKChargeEffect(applyto.getId(), sourceid, localstatups);
} else if (isInfusion()) {
buff = MaplePacketCreator.givePirateBuff(localstatups, sourceid, seconds);
mbuff = MaplePacketCreator.giveForeignPirateBuff(applyto.getId(), sourceid, seconds, localstatups);
buff = PacketCreator.givePirateBuff(localstatups, sourceid, seconds);
mbuff = PacketCreator.giveForeignPirateBuff(applyto.getId(), sourceid, seconds, localstatups);
} else if (isDs()) {
List<Pair<MapleBuffStat, Integer>> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.DARKSIGHT, 0));
mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), dsstat);
mbuff = PacketCreator.giveForeignBuff(applyto.getId(), dsstat);
} else if (isWw()) {
List<Pair<MapleBuffStat, Integer>> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.WIND_WALK, 0));
mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), dsstat);
mbuff = PacketCreator.giveForeignBuff(applyto.getId(), dsstat);
} else if (isCombo()) {
Integer comboCount = applyto.getBuffedValue(MapleBuffStat.COMBO);
if (comboCount == null) comboCount = 0;
List<Pair<MapleBuffStat, Integer>> cbstat = Collections.singletonList(new Pair<>(MapleBuffStat.COMBO, comboCount));
buff = MaplePacketCreator.giveBuff((skill ? sourceid : -sourceid), localDuration, cbstat);
mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), cbstat);
buff = PacketCreator.giveBuff((skill ? sourceid : -sourceid), localDuration, cbstat);
mbuff = PacketCreator.giveForeignBuff(applyto.getId(), cbstat);
} else if (isMonsterRiding()) {
if (sourceid == Corsair.BATTLE_SHIP) {//hp
if (applyto.getBattleshipHp() <= 0) {
@@ -1297,23 +1297,23 @@ public class MapleStatEffect {
localstatups = statups;
}
buff = MaplePacketCreator.giveBuff(localsourceid, localDuration, localstatups);
mbuff = MaplePacketCreator.showMonsterRiding(applyto.getId(), givemount);
buff = PacketCreator.giveBuff(localsourceid, localDuration, localstatups);
mbuff = PacketCreator.showMonsterRiding(applyto.getId(), givemount);
localDuration = duration;
} else if (isShadowPartner()) {
List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.SHADOWPARTNER, 0));
mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), stat);
mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat);
} else if (isSoulArrow()) {
List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.SOULARROW, 0));
mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), stat);
mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat);
} else if (isEnrage()) {
applyto.handleOrbconsume();
} else if (isMorph()) {
List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.MORPH, getMorph(applyto)));
mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), stat);
mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat);
} else if (isAriantShield()) {
List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.AURA, 1));
mbuff = MaplePacketCreator.giveForeignBuff(applyto.getId(), stat);
mbuff = PacketCreator.giveForeignBuff(applyto.getId(), stat);
}
if (buff != null) {

14
src/main/java/server/MapleStorage.java
View File

@@ -32,7 +32,7 @@ import provider.MapleDataTool;
import provider.wz.WZFiles;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.sql.Connection;
@@ -227,7 +227,7 @@ public class MapleStorage {
public void sendStorage(MapleClient c, int npcId) {
if (c.getPlayer().getLevel() < 15){
c.getPlayer().dropMessage(1, "You may only use the storage once you have reached level 15.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -248,7 +248,7 @@ public class MapleStorage {
}
currentNpcid = npcId;
c.announce(MaplePacketCreator.getStorage(npcId, slots, storageItems, meso));
c.announce(PacketCreator.getStorage(npcId, slots, storageItems, meso));
} finally {
lock.unlock();
}
@@ -257,7 +257,7 @@ public class MapleStorage {
public void sendStored(MapleClient c, MapleInventoryType type) {
lock.lock();
try {
c.announce(MaplePacketCreator.storeStorage(slots, type, typeItems.get(type)));
c.announce(PacketCreator.storeStorage(slots, type, typeItems.get(type)));
} finally {
lock.unlock();
}
@@ -266,7 +266,7 @@ public class MapleStorage {
public void sendTakenOut(MapleClient c, MapleInventoryType type) {
lock.lock();
try {
c.announce(MaplePacketCreator.takeOutStorage(slots, type, typeItems.get(type)));
c.announce(PacketCreator.takeOutStorage(slots, type, typeItems.get(type)));
} finally {
lock.unlock();
}
@@ -283,7 +283,7 @@ public class MapleStorage {
typeItems.put(type, new ArrayList<>(items));
}
c.announce(MaplePacketCreator.arrangeStorage(slots, items));
c.announce(PacketCreator.arrangeStorage(slots, items));
} finally {
lock.unlock();
}
@@ -301,7 +301,7 @@ public class MapleStorage {
}
public void sendMeso(MapleClient c) {
c.announce(MaplePacketCreator.mesoStorage(slots, meso));
c.announce(PacketCreator.mesoStorage(slots, meso));
}
public int getStoreFee() { // thanks to GabrielSin

42
src/main/java/server/MapleTrade.java
View File

@@ -21,27 +21,27 @@
*/
package server;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import config.YamlConfig;
import tools.LogHelper;
import tools.MaplePacketCreator;
import client.MapleCharacter;
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.game.GameConstants;
import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteResult;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult;
import tools.LogHelper;
import tools.PacketCreator;
import tools.Pair;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
/**
*
* @author Matze
@@ -104,7 +104,7 @@ public class MapleTrade {
private void lockTrade() {
locked.set(true);
partner.getChr().getClient().announce(MaplePacketCreator.getTradeConfirmation());
partner.getChr().getClient().announce(PacketCreator.getTradeConfirmation());
}
private void fetchExchangedItems() {
@@ -143,7 +143,7 @@ public class MapleTrade {
exchangeItems.clear();
}
chr.getClient().announce(MaplePacketCreator.getTradeResult(number, result));
chr.getClient().announce(PacketCreator.getTradeResult(number, result));
}
private void cancel(byte result) {
@@ -164,7 +164,7 @@ public class MapleTrade {
exchangeItems.clear();
}
chr.getClient().announce(MaplePacketCreator.getTradeResult(number, result));
chr.getClient().announce(PacketCreator.getTradeResult(number, result));
}
private boolean isLocked() {
@@ -186,9 +186,9 @@ public class MapleTrade {
if (chr.getMeso() >= meso) {
chr.gainMeso(-meso, false, true, false);
this.meso += meso;
chr.getClient().announce(MaplePacketCreator.getTradeMesoSet((byte) 0, this.meso));
chr.getClient().announce(PacketCreator.getTradeMesoSet((byte) 0, this.meso));
if (partner != null) {
partner.getChr().getClient().announce(MaplePacketCreator.getTradeMesoSet((byte) 1, this.meso));
partner.getChr().getClient().announce(PacketCreator.getTradeMesoSet((byte) 1, this.meso));
}
} else {
}
@@ -212,9 +212,9 @@ public class MapleTrade {
}
public void chat(String message) {
chr.getClient().announce(MaplePacketCreator.getTradeChat(chr, message, true));
chr.getClient().announce(PacketCreator.getTradeChat(chr, message, true));
if (partner != null) {
partner.getChr().getClient().announce(MaplePacketCreator.getTradeChat(chr, message, false));
partner.getChr().getClient().announce(PacketCreator.getTradeChat(chr, message, false));
}
}
@@ -334,7 +334,7 @@ public class MapleTrade {
if (local.getChr().getLevel() < 15) {
if (local.getChr().getMesosTraded() + local.exchangeMeso > 1000000) {
cancelTrade(local.getChr(), TradeResult.NO_RESPONSE);
local.getChr().getClient().announce(MaplePacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
local.getChr().getClient().announce(PacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
return;
} else {
local.getChr().addMesosTraded(local.exchangeMeso);
@@ -342,7 +342,7 @@ public class MapleTrade {
} else if (partner.getChr().getLevel() < 15) {
if (partner.getChr().getMesosTraded() + partner.exchangeMeso > 1000000) {
cancelTrade(partner.getChr(), TradeResult.NO_RESPONSE);
partner.getChr().getClient().announce(MaplePacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
partner.getChr().getClient().announce(PacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
return;
} else {
partner.getChr().addMesosTraded(partner.exchangeMeso);
@@ -463,8 +463,8 @@ public class MapleTrade {
c2.getTrade().setPartner(c1.getTrade());
c1.getTrade().setPartner(c2.getTrade());
c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 0));
c2.getClient().announce(MaplePacketCreator.tradeInvite(c1));
c1.getClient().announce(PacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 0));
c2.getClient().announce(PacketCreator.tradeInvite(c1));
} else {
c1.message("The other player is already trading with someone else.");
cancelTrade(c1, TradeResult.NO_RESPONSE);
@@ -482,8 +482,8 @@ public class MapleTrade {
InviteResult res = inviteRes.result;
if (res == InviteResult.ACCEPTED) {
if (c1.getTrade() != null && c1.getTrade().getPartner() == c2.getTrade() && c2.getTrade() != null && c2.getTrade().getPartner() == c1.getTrade()) {
c2.getClient().announce(MaplePacketCreator.getTradePartnerAdd(c1));
c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 1));
c2.getClient().announce(PacketCreator.getTradePartnerAdd(c1));
c1.getClient().announce(PacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 1));
c1.getTrade().setFullTrade(true);
c2.getTrade().setFullTrade(true);
} else {

44
src/main/java/server/events/gm/MapleCoconut.java
View File

@@ -25,7 +25,7 @@ package server.events.gm;
import client.MapleCharacter;
import server.TimerManager;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -55,9 +55,9 @@ public class MapleCoconut extends MapleEvent {
for (int i = 0; i < 506; i++) {
coconuts.add(new MapleCoconuts(i));
}
map.broadcastMessage(MaplePacketCreator.hitCoconut(true, 0, 0));
map.broadcastMessage(PacketCreator.hitCoconut(true, 0, 0));
setCoconutsHittable(true);
map.broadcastMessage(MaplePacketCreator.getClock(300));
map.broadcastMessage(PacketCreator.getClock(300));
TimerManager.getInstance().schedule(() -> {
if (map.getId() == 109080000) {
@@ -66,22 +66,22 @@ public class MapleCoconut extends MapleEvent {
} else if (getMapleScore() > getStoryScore()) {
for (MapleCharacter chr : map.getCharacters()) {
if (chr.getTeam() == 0) {
chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/victory"));
chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Victory"));
chr.getClient().announce(PacketCreator.showEffect("event/coconut/victory"));
chr.getClient().announce(PacketCreator.playSound("Coconut/Victory"));
} else {
chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/lose"));
chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Failed"));
chr.getClient().announce(PacketCreator.showEffect("event/coconut/lose"));
chr.getClient().announce(PacketCreator.playSound("Coconut/Failed"));
}
}
warpOut();
} else {
for (MapleCharacter chr : map.getCharacters()) {
if (chr.getTeam() == 1) {
chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/victory"));
chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Victory"));
chr.getClient().announce(PacketCreator.showEffect("event/coconut/victory"));
chr.getClient().announce(PacketCreator.playSound("Coconut/Victory"));
} else {
chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/lose"));
chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Failed"));
chr.getClient().announce(PacketCreator.showEffect("event/coconut/lose"));
chr.getClient().announce(PacketCreator.playSound("Coconut/Failed"));
}
}
warpOut();
@@ -91,33 +91,33 @@ public class MapleCoconut extends MapleEvent {
}
public void bonusTime() {
map.broadcastMessage(MaplePacketCreator.getClock(120));
map.broadcastMessage(PacketCreator.getClock(120));
TimerManager.getInstance().schedule(() -> {
if (getMapleScore() == getStoryScore()) {
for (MapleCharacter chr : map.getCharacters()) {
chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/lose"));
chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Failed"));
chr.getClient().announce(PacketCreator.showEffect("event/coconut/lose"));
chr.getClient().announce(PacketCreator.playSound("Coconut/Failed"));
}
warpOut();
} else if (getMapleScore() > getStoryScore()) {
for (MapleCharacter chr : map.getCharacters()) {
if (chr.getTeam() == 0) {
chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/victory"));
chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Victory"));
chr.getClient().announce(PacketCreator.showEffect("event/coconut/victory"));
chr.getClient().announce(PacketCreator.playSound("Coconut/Victory"));
} else {
chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/lose"));
chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Failed"));
chr.getClient().announce(PacketCreator.showEffect("event/coconut/lose"));
chr.getClient().announce(PacketCreator.playSound("Coconut/Failed"));
}
}
warpOut();
} else {
for (MapleCharacter chr : map.getCharacters()) {
if (chr.getTeam() == 1) {
chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/victory"));
chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Victory"));
chr.getClient().announce(PacketCreator.showEffect("event/coconut/victory"));
chr.getClient().announce(PacketCreator.playSound("Coconut/Victory"));
} else {
chr.getClient().announce(MaplePacketCreator.showEffect("event/coconut/lose"));
chr.getClient().announce(MaplePacketCreator.playSound("Coconut/Failed"));
chr.getClient().announce(PacketCreator.showEffect("event/coconut/lose"));
chr.getClient().announce(PacketCreator.playSound("Coconut/Failed"));
}
}
warpOut();

30
src/main/java/server/events/gm/MapleFitness.java
View File

@@ -24,7 +24,7 @@ package server.events.gm;
import client.MapleCharacter;
import server.TimerManager;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.concurrent.ScheduledFuture;
@@ -49,13 +49,13 @@ public class MapleFitness {
public void startFitness() {
chr.getMap().startEvent();
chr.getClient().announce(MaplePacketCreator.getClock(900));
chr.getClient().announce(PacketCreator.getClock(900));
this.timeStarted = System.currentTimeMillis();
this.time = 900000;
checkAndMessage();
chr.getMap().getPortal("join00").setPortalStatus(true);
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The portal has now opened. Press the up arrow key at the portal to enter."));
chr.getClient().announce(PacketCreator.serverNotice(0, "The portal has now opened. Press the up arrow key at the portal to enter."));
}
public boolean isTimerStarted() {
@@ -84,29 +84,29 @@ public class MapleFitness {
}
if (chr.getMap().getId() >= 109040000 && chr.getMap().getId() <= 109040004) {
if (getTimeLeft() > 9000 && getTimeLeft() < 11000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "You have 10 sec left. Those of you unable to beat the game, we hope you beat it next time! Great job everyone!! See you later~"));
chr.getClient().announce(PacketCreator.serverNotice(0, "You have 10 sec left. Those of you unable to beat the game, we hope you beat it next time! Great job everyone!! See you later~"));
} else if (getTimeLeft() > 99000 && getTimeLeft() < 101000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "Alright, you don't have much time remaining. Please hurry up a little!"));
chr.getClient().announce(PacketCreator.serverNotice(0, "Alright, you don't have much time remaining. Please hurry up a little!"));
} else if (getTimeLeft() > 239000 && getTimeLeft() < 241000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The 4th stage is the last one for [The Maple Physical Fitness Test]. Please don't give up at the last minute and try your best. The reward is waiting for you at the very top!"));
chr.getClient().announce(PacketCreator.serverNotice(0, "The 4th stage is the last one for [The Maple Physical Fitness Test]. Please don't give up at the last minute and try your best. The reward is waiting for you at the very top!"));
} else if (getTimeLeft() > 299000 && getTimeLeft() < 301000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The 3rd stage offers traps where you may see them, but you won't be able to step on them. Please be careful of them as you make your way up."));
chr.getClient().announce(PacketCreator.serverNotice(0, "The 3rd stage offers traps where you may see them, but you won't be able to step on them. Please be careful of them as you make your way up."));
} else if (getTimeLeft() > 359000 && getTimeLeft() < 361000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "For those who have heavy lags, please make sure to move slowly to avoid falling all the way down because of lags."));
chr.getClient().announce(PacketCreator.serverNotice(0, "For those who have heavy lags, please make sure to move slowly to avoid falling all the way down because of lags."));
} else if (getTimeLeft() > 499000 && getTimeLeft() < 501000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "Please remember that if you die during the event, you'll be eliminated from the game. If you're running out of HP, either take a potion or recover HP first before moving on."));
chr.getClient().announce(PacketCreator.serverNotice(0, "Please remember that if you die during the event, you'll be eliminated from the game. If you're running out of HP, either take a potion or recover HP first before moving on."));
} else if (getTimeLeft() > 599000 && getTimeLeft() < 601000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The most important thing you'll need to know to avoid the bananas thrown by the monkeys is *Timing* Timing is everything in this!"));
chr.getClient().announce(PacketCreator.serverNotice(0, "The most important thing you'll need to know to avoid the bananas thrown by the monkeys is *Timing* Timing is everything in this!"));
} else if (getTimeLeft() > 659000 && getTimeLeft() < 661000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The 2nd stage offers monkeys throwing bananas. Please make sure to avoid them by moving along at just the right timing."));
chr.getClient().announce(PacketCreator.serverNotice(0, "The 2nd stage offers monkeys throwing bananas. Please make sure to avoid them by moving along at just the right timing."));
} else if (getTimeLeft() > 699000 && getTimeLeft() < 701000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "Please remember that if you die during the event, you'll be eliminated from the game. You still have plenty of time left, so either take a potion or recover HP first before moving on."));
chr.getClient().announce(PacketCreator.serverNotice(0, "Please remember that if you die during the event, you'll be eliminated from the game. You still have plenty of time left, so either take a potion or recover HP first before moving on."));
} else if (getTimeLeft() > 779000 && getTimeLeft() < 781000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "Everyone that clears [The Maple Physical Fitness Test] on time will be given an item, regardless of the order of finish, so just relax, take your time, and clear the 4 stages."));
chr.getClient().announce(PacketCreator.serverNotice(0, "Everyone that clears [The Maple Physical Fitness Test] on time will be given an item, regardless of the order of finish, so just relax, take your time, and clear the 4 stages."));
} else if (getTimeLeft() > 839000 && getTimeLeft() < 841000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "There may be a heavy lag due to many users at stage 1 all at once. It won't be difficult, so please make sure not to fall down because of heavy lag."));
chr.getClient().announce(PacketCreator.serverNotice(0, "There may be a heavy lag due to many users at stage 1 all at once. It won't be difficult, so please make sure not to fall down because of heavy lag."));
} else if (getTimeLeft() > 869000 && getTimeLeft() < 871000) {
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "[MapleStory Physical Fitness Test] consists of 4 stages, and if you happen to die during the game, you'll be eliminated from the game, so please be careful of that."));
chr.getClient().announce(PacketCreator.serverNotice(0, "[MapleStory Physical Fitness Test] consists of 4 stages, and if you happen to die during the game, you'll be eliminated from the game, so please be careful of that."));
}
} else {
resetTimes();

6
src/main/java/server/events/gm/MapleOla.java
View File

@@ -23,7 +23,7 @@ package server.events.gm;
import client.MapleCharacter;
import server.TimerManager;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.concurrent.ScheduledFuture;
@@ -48,12 +48,12 @@ public class MapleOla {
public void startOla() { // TODO: Messages
chr.getMap().startEvent();
chr.getClient().announce(MaplePacketCreator.getClock(360));
chr.getClient().announce(PacketCreator.getClock(360));
this.timeStarted = System.currentTimeMillis();
this.time = 360000;
chr.getMap().getPortal("join00").setPortalStatus(true);
chr.getClient().announce(MaplePacketCreator.serverNotice(0, "The portal has now opened. Press the up arrow key at the portal to enter."));
chr.getClient().announce(PacketCreator.serverNotice(0, "The portal has now opened. Press the up arrow key at the portal to enter."));
}
public boolean isTimerStarted() {

8
src/main/java/server/events/gm/MapleOxQuiz.java
View File

@@ -28,7 +28,7 @@ import provider.MapleDataTool;
import provider.wz.WZFiles;
import server.TimerManager;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Randomizer;
import java.util.ArrayList;
@@ -69,9 +69,9 @@ public final class MapleOxQuiz {
}
}
final int number = gm;
map.broadcastMessage(MaplePacketCreator.showOXQuiz(round, question, true));
map.broadcastMessage(PacketCreator.showOXQuiz(round, question, true));
TimerManager.getInstance().schedule(() -> {
map.broadcastMessage(MaplePacketCreator.showOXQuiz(round, question, true));
map.broadcastMessage(PacketCreator.showOXQuiz(round, question, true));
List<MapleCharacter> chars = new ArrayList<>(map.getCharacters());
for (MapleCharacter chr : chars) {
@@ -92,7 +92,7 @@ public final class MapleOxQuiz {
}
//send question
if (map.getCharacters().size() - number <= 2) {
map.broadcastMessage(MaplePacketCreator.serverNotice(6, "The event has ended"));
map.broadcastMessage(PacketCreator.serverNotice(6, "The event has ended"));
map.getPortal("join00").setPortalStatus(true);
map.setOx(null);
map.setOxQuiz(false);

20
src/main/java/server/events/gm/MapleSnowball.java
View File

@@ -24,7 +24,7 @@ package server.events.gm;
import client.MapleCharacter;
import server.TimerManager;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.LinkedList;
import java.util.List;
@@ -58,8 +58,8 @@ public class MapleSnowball {
for (MapleCharacter chr : characters) {
if (chr != null) {
chr.announce(MaplePacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1)));
chr.announce(MaplePacketCreator.getClock(600));
chr.announce(PacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1)));
chr.announce(PacketCreator.getClock(600));
}
}
hittable = true;
@@ -67,13 +67,13 @@ public class MapleSnowball {
if (map.getSnowball(team).getPosition() > map.getSnowball(team == 0 ? 1 : 0).getPosition()) {
for (MapleCharacter chr : characters) {
if (chr != null)
chr.announce(MaplePacketCreator.rollSnowBall(false, 3, map.getSnowball(0), map.getSnowball(0)));
chr.announce(PacketCreator.rollSnowBall(false, 3, map.getSnowball(0), map.getSnowball(0)));
}
winner = true;
} else if (map.getSnowball(team == 0 ? 1 : 0).getPosition() > map.getSnowball(team).getPosition()) {
for (MapleCharacter chr : characters) {
if (chr != null)
chr.announce(MaplePacketCreator.rollSnowBall(false, 4, map.getSnowball(0), map.getSnowball(0)));
chr.announce(PacketCreator.rollSnowBall(false, 4, map.getSnowball(0), map.getSnowball(0)));
}
winner = true;
} //Else
@@ -116,7 +116,7 @@ public class MapleSnowball {
}, 10000);
} else
this.snowmanhp -= damage;
map.broadcastMessage(MaplePacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1)));
map.broadcastMessage(PacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1)));
}
if (this.hits == 0) {
@@ -129,16 +129,16 @@ public class MapleSnowball {
map.getSnowball(team == 0 ? 1 : 0).message(3);
this.hits = 3;
map.broadcastMessage(MaplePacketCreator.rollSnowBall(false, 0, map.getSnowball(0), map.getSnowball(1)));
map.broadcastMessage(MaplePacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1)));
map.broadcastMessage(PacketCreator.rollSnowBall(false, 0, map.getSnowball(0), map.getSnowball(1)));
map.broadcastMessage(PacketCreator.rollSnowBall(false, 1, map.getSnowball(0), map.getSnowball(1)));
}
map.broadcastMessage(MaplePacketCreator.hitSnowBall(what, damage));
map.broadcastMessage(PacketCreator.hitSnowBall(what, damage));
}
public void message(int message) {
for (MapleCharacter chr : characters) {
if (chr != null)
chr.announce(MaplePacketCreator.snowballMessage(team, message));
chr.announce(PacketCreator.snowballMessage(team, message));
}
}

34
src/main/java/server/expeditions/MapleExpedition.java
View File

@@ -33,7 +33,7 @@ import server.TimerManager;
import server.life.MapleMonster;
import server.maps.MapleMap;
import tools.LogHelper;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -115,10 +115,10 @@ public class MapleExpedition {
public void beginRegistration() {
registering = true;
leader.announce(MaplePacketCreator.getClock(type.getRegistrationTime() * 60));
leader.announce(PacketCreator.getClock(type.getRegistrationTime() * 60));
if (!silent) {
startMap.broadcastMessage(leader, MaplePacketCreator.serverNotice(6, "[Expedition] " + leader.getName() + " has been declared the expedition captain. Please register for the expedition."), false);
leader.announce(MaplePacketCreator.serverNotice(6, "[Expedition] You have become the expedition captain. Gather enough people for your team then talk to the NPC to start."));
startMap.broadcastMessage(leader, PacketCreator.serverNotice(6, "[Expedition] " + leader.getName() + " has been declared the expedition captain. Please register for the expedition."), false);
leader.announce(PacketCreator.serverNotice(6, "[Expedition] You have become the expedition captain. Gather enough people for your team then talk to the NPC to start."));
}
scheduleRegistrationEnd();
}
@@ -130,7 +130,7 @@ public class MapleExpedition {
schedule = TimerManager.getInstance().schedule(() -> {
if (registering){
exped.removeChannelExpedition(startMap.getChannelServer());
if (!silent) startMap.broadcastMessage(MaplePacketCreator.serverNotice(6, "[Expedition] The time limit has been reached. Expedition has been disbanded."));
if (!silent) startMap.broadcastMessage(PacketCreator.serverNotice(6, "[Expedition] The time limit has been reached. Expedition has been disbanded."));
dispose(false);
}
@@ -138,7 +138,7 @@ dispose(false);
}
public void dispose(boolean log){
broadcastExped(MaplePacketCreator.removeClock());
broadcastExped(PacketCreator.removeClock());
if (schedule != null){
schedule.cancel(false);
@@ -155,10 +155,10 @@ dispose(false);
public void start(){
finishRegistration();
registerExpeditionAttempt();
broadcastExped(MaplePacketCreator.removeClock());
if (!silent) broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] The expedition has started! Good luck, brave heroes!"));
broadcastExped(PacketCreator.removeClock());
if (!silent) broadcastExped(PacketCreator.serverNotice(6, "[Expedition] The expedition has started! Good luck, brave heroes!"));
startTime = System.currentTimeMillis();
Server.getInstance().broadcastGMMessage(startMap.getWorld(), MaplePacketCreator.serverNotice(6, "[Expedition] " + type.toString() + " Expedition started with leader: " + leader.getName()));
Server.getInstance().broadcastGMMessage(startMap.getWorld(), PacketCreator.serverNotice(6, "[Expedition] " + type.toString() + " Expedition started with leader: " + leader.getName()));
}
public String addMember(MapleCharacter player) {
@@ -178,8 +178,8 @@ dispose(false);
}
members.put(player.getId(), player.getName());
player.announce(MaplePacketCreator.getClock((int)(startTime - System.currentTimeMillis()) / 1000));
if (!silent) broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + player.getName() + " has joined the expedition!"));
player.announce(PacketCreator.getClock((int)(startTime - System.currentTimeMillis()) / 1000));
if (!silent) broadcastExped(PacketCreator.serverNotice(6, "[Expedition] " + player.getName() + " has joined the expedition!"));
return "You have registered for the expedition successfully!";
}
@@ -195,8 +195,8 @@ dispose(false);
}
members.put(player.getId(), player.getName());
player.announce(MaplePacketCreator.getClock((int) (startTime - System.currentTimeMillis()) / 1000));
if (!silent) broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + player.getName() + " has joined the expedition!"));
player.announce(PacketCreator.getClock((int) (startTime - System.currentTimeMillis()) / 1000));
if (!silent) broadcastExped(PacketCreator.serverNotice(6, "[Expedition] " + player.getName() + " has joined the expedition!"));
return 0; //"You have registered for the expedition successfully!";
}
@@ -216,9 +216,9 @@ dispose(false);
public boolean removeMember(MapleCharacter chr) {
if(members.remove(chr.getId()) != null) {
chr.announce(MaplePacketCreator.removeClock());
chr.announce(PacketCreator.removeClock());
if (!silent) {
broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + chr.getName() + " has left the expedition."));
broadcastExped(PacketCreator.serverNotice(6, "[Expedition] " + chr.getName() + " has left the expedition."));
chr.dropMessage(6, "[Expedition] You have left this expedition.");
}
return true;
@@ -233,11 +233,11 @@ dispose(false);
banned.add(cid);
members.remove(cid);
if (!silent) broadcastExped(MaplePacketCreator.serverNotice(6, "[Expedition] " + chr.getValue() + " has been banned from the expedition."));
if (!silent) broadcastExped(PacketCreator.serverNotice(6, "[Expedition] " + chr.getValue() + " has been banned from the expedition."));
MapleCharacter player = startMap.getWorldServer().getPlayerStorage().getCharacterById(cid);
if (player != null && player.isLoggedinWorld()) {
player.announce(MaplePacketCreator.removeClock());
player.announce(PacketCreator.removeClock());
if (!silent) player.dropMessage(6, "[Expedition] You have been banned from this expedition.");
if (MapleExpeditionType.ARIANT.equals(type) || MapleExpeditionType.ARIANT1.equals(type) || MapleExpeditionType.ARIANT2.equals(type)) {
player.changeMap(980010000);

52
src/main/java/server/life/MapleMonster.java
View File

@@ -48,7 +48,7 @@ import server.maps.MapleMap;
import server.maps.MapleMapObjectType;
import server.maps.MapleSummon;
import tools.IntervalBuilder;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.Randomizer;
@@ -365,7 +365,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
from.getMap().broadcastBossHpMessage(this, this.hashCode(), makeBossHPBarPacket(), getPosition());
} else if (!isBoss()) {
int remainingHP = (int) Math.max(1, hp.get() * 100f / getMaxHp());
byte[] packet = MaplePacketCreator.showMonsterHP(getObjectId(), remainingHP);
byte[] packet = PacketCreator.showMonsterHP(getObjectId(), remainingHP);
if (from.getParty() != null) {
for (MaplePartyCharacter mpc : from.getParty().getMembers()) {
MapleCharacter member = from.getMap().getCharacterById(mpc.getId()); // god bless
@@ -471,7 +471,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
setMp(mp2Heal);
if (hp > 0) {
getMap().broadcastMessage(MaplePacketCreator.healMonster(getObjectId(), hp, getHp(), getMaxHp()));
getMap().broadcastMessage(PacketCreator.healMonster(getObjectId(), hp, getHp(), getMaxHp()));
}
maxHpPlusHeal.addAndGet(hpHealed);
@@ -758,13 +758,13 @@ public class MapleMonster extends AbstractLoadedMapleLife {
if (toSpawn != null) {
final MapleMap reviveMap = map;
if (toSpawn.contains(9300216) && reviveMap.getId() > 925000000 && reviveMap.getId() < 926000000) {
reviveMap.broadcastMessage(MaplePacketCreator.playSound("Dojang/clear"));
reviveMap.broadcastMessage(MaplePacketCreator.showEffect("dojang/end/clear"));
reviveMap.broadcastMessage(PacketCreator.playSound("Dojang/clear"));
reviveMap.broadcastMessage(PacketCreator.showEffect("dojang/end/clear"));
}
Pair<Integer, String> timeMob = reviveMap.getTimeMob();
if (timeMob != null) {
if (toSpawn.contains(timeMob.getLeft())) {
reviveMap.broadcastMessage(MaplePacketCreator.serverNotice(6, timeMob.getRight()));
reviveMap.broadcastMessage(PacketCreator.serverNotice(6, timeMob.getRight()));
}
}
@@ -1006,7 +1006,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
public byte[] makeBossHPBarPacket() {
return MaplePacketCreator.showBossHP(getId(), getHp(), getMaxHp(), getTagColor(), getTagBgColor());
return PacketCreator.showBossHP(getId(), getHp(), getMaxHp(), getTagColor(), getTagBgColor());
}
public boolean hasBossHPBar() {
@@ -1019,9 +1019,9 @@ public class MapleMonster extends AbstractLoadedMapleLife {
return;
}
if (fake) {
client.announce(MaplePacketCreator.spawnFakeMonster(this, 0));
client.announce(PacketCreator.spawnFakeMonster(this, 0));
} else {
client.announce(MaplePacketCreator.spawnMonster(this, false));
client.announce(PacketCreator.spawnMonster(this, false));
}
if (hasBossHPBar()) {
@@ -1031,8 +1031,8 @@ public class MapleMonster extends AbstractLoadedMapleLife {
@Override
public void sendDestroyData(MapleClient client) {
client.announce(MaplePacketCreator.killMonster(getObjectId(), false));
client.announce(MaplePacketCreator.killMonster(getObjectId(), true));
client.announce(PacketCreator.killMonster(getObjectId(), false));
client.announce(PacketCreator.killMonster(getObjectId(), true));
}
@Override
@@ -1097,7 +1097,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
private int broadcastStatusEffect(final MonsterStatusEffect status) {
int animationTime = status.getSkill().getAnimationTime();
byte[] packet = MaplePacketCreator.applyMonsterStatus(getObjectId(), status, null);
byte[] packet = PacketCreator.applyMonsterStatus(getObjectId(), status, null);
broadcastMonsterStatusMessage(packet);
return animationTime;
@@ -1172,7 +1172,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
final Runnable cancelTask = () -> {
if (isAlive()) {
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), status.getStati());
byte[] packet = PacketCreator.cancelMonsterStatus(getObjectId(), status.getStati());
broadcastMonsterStatusMessage(packet);
}
@@ -1284,7 +1284,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
public void applyMonsterBuff(final Map<MonsterStatus, Integer> stats, final int x, int skillId, long duration, MobSkill skill, final List<Integer> reflection) {
final Runnable cancelTask = () -> {
if (isAlive()) {
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), stats);
byte[] packet = PacketCreator.cancelMonsterStatus(getObjectId(), stats);
broadcastMonsterStatusMessage(packet);
statiLock.lock();
@@ -1298,7 +1298,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
};
final MonsterStatusEffect effect = new MonsterStatusEffect(stats, null, skill, true);
byte[] packet = MaplePacketCreator.applyMonsterStatus(getObjectId(), effect, reflection);
byte[] packet = PacketCreator.applyMonsterStatus(getObjectId(), effect, reflection);
broadcastMonsterStatusMessage(packet);
statiLock.lock();
@@ -1323,7 +1323,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
aggroRemoveController();
setPosition(newPoint);
map.broadcastMessage(MaplePacketCreator.moveMonster(this.getObjectId(), false, -1, 0, 0, 0, this.getPosition(), this.getIdleMovement(), getIdleMovementDataLength()));
map.broadcastMessage(PacketCreator.moveMonster(this.getObjectId(), false, -1, 0, 0, 0, this.getPosition(), this.getIdleMovement(), getIdleMovementDataLength()));
map.moveMonster(this, this.getPosition());
aggroUpdateController();
@@ -1339,7 +1339,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
if (oldEffect != null) {
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), oldEffect.getStati());
byte[] packet = PacketCreator.cancelMonsterStatus(getObjectId(), oldEffect.getStati());
broadcastMonsterStatusMessage(packet);
}
}
@@ -1639,10 +1639,10 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
if (type == 1) {
map.broadcastMessage(MaplePacketCreator.damageMonster(getObjectId(), damage), getPosition());
map.broadcastMessage(PacketCreator.damageMonster(getObjectId(), damage), getPosition());
} else if (type == 2) {
if(damage < dealDamage) { // ninja ambush (type 2) is already displaying DOT to the caster
map.broadcastMessage(MaplePacketCreator.damageMonster(getObjectId(), damage), getPosition());
map.broadcastMessage(PacketCreator.damageMonster(getObjectId(), damage), getPosition());
}
}
}
@@ -1884,7 +1884,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
if (chrController != null) { // this can/should only happen when a hidden gm attacks the monster
if (!this.isFake()) chrController.announce(MaplePacketCreator.stopControllingMonster(this.getObjectId()));
if (!this.isFake()) chrController.announce(PacketCreator.stopControllingMonster(this.getObjectId()));
chrController.stopControllingMonster(this);
}
@@ -2088,7 +2088,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
Maybe Nexon intended to interchange controllers at every attack...
else if (chrController != null) {
chrController.announce(MaplePacketCreator.stopControllingMonster(this.getObjectId()));
chrController.announce(PacketCreator.stopControllingMonster(this.getObjectId()));
aggroMonsterControl(chrController.getClient(), this, true);
}
*/
@@ -2099,7 +2099,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
private static void aggroMonsterControl(MapleClient c, MapleMonster mob, boolean immediateAggro) {
c.announce(MaplePacketCreator.controlMonster(mob, false, immediateAggro));
c.announce(PacketCreator.controlMonster(mob, false, immediateAggro));
}
private void aggroRefreshPuppetVisibility(MapleCharacter chrController, MapleSummon puppet) {
@@ -2113,15 +2113,15 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
for (MapleMonster mob : puppetControlled) {
chrController.announce(MaplePacketCreator.stopControllingMonster(mob.getObjectId()));
chrController.announce(PacketCreator.stopControllingMonster(mob.getObjectId()));
}
chrController.announce(MaplePacketCreator.removeSummon(puppet, false));
chrController.announce(PacketCreator.removeSummon(puppet, false));
MapleClient c = chrController.getClient();
for (MapleMonster mob : puppetControlled) { // thanks BHB for noticing puppets disrupting mobstatuses for bowmans
aggroMonsterControl(c, mob, mob.isControllerKnowsAboutAggro());
}
chrController.announce(MaplePacketCreator.spawnSummon(puppet, false));
chrController.announce(PacketCreator.spawnSummon(puppet, false));
}
public void aggroUpdatePuppetVisibility() {
@@ -2151,7 +2151,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
if (controllerHasPuppet) {
controllerHasPuppet = false;
chrController.announce(MaplePacketCreator.stopControllingMonster(MapleMonster.this.getObjectId()));
chrController.announce(PacketCreator.stopControllingMonster(MapleMonster.this.getObjectId()));
aggroMonsterControl(chrController.getClient(), MapleMonster.this, MapleMonster.this.isControllerHasAggro());
}
} finally {

10
src/main/java/server/life/MapleNPC.java
View File

@@ -24,7 +24,7 @@ package server.life;
import client.MapleClient;
import server.MapleShopFactory;
import server.maps.MapleMapObjectType;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class MapleNPC extends AbstractLoadedMapleLife {
private MapleNPCStats stats;
@@ -44,14 +44,14 @@ public class MapleNPC extends AbstractLoadedMapleLife {
@Override
public void sendSpawnData(MapleClient client) {
client.announce(MaplePacketCreator.spawnNPC(this));
client.announce(MaplePacketCreator.spawnNPCRequestController(this, true));
client.announce(PacketCreator.spawnNPC(this));
client.announce(PacketCreator.spawnNPCRequestController(this, true));
}
@Override
public void sendDestroyData(MapleClient client) {
client.announce(MaplePacketCreator.removeNPCController(getObjectId()));
client.announce(MaplePacketCreator.removeNPC(getObjectId()));
client.announce(PacketCreator.removeNPCController(getObjectId()));
client.announce(PacketCreator.removeNPC(getObjectId()));
}
@Override

22
src/main/java/server/life/MaplePlayerNPC.java
View File

@@ -37,7 +37,7 @@ import server.maps.MapleMap;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.awt.*;
@@ -200,14 +200,14 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
@Override
public void sendSpawnData(MapleClient client) {
client.announce(MaplePacketCreator.spawnPlayerNPC(this));
client.announce(MaplePacketCreator.getPlayerNPC(this));
client.announce(PacketCreator.spawnPlayerNPC(this));
client.announce(PacketCreator.getPlayerNPC(this));
}
@Override
public void sendDestroyData(MapleClient client) {
client.announce(MaplePacketCreator.removeNPCController(this.getObjectId()));
client.announce(MaplePacketCreator.removePlayerNPC(this.getObjectId()));
client.announce(PacketCreator.removeNPCController(this.getObjectId()));
client.announce(PacketCreator.removePlayerNPC(this.getObjectId()));
}
private static void getRunningMetadata() {
@@ -540,8 +540,8 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
MapleMap m = channel.getMapFactory().getMap(mapid);
m.addPlayerNPCMapObject(pn);
m.broadcastMessage(MaplePacketCreator.spawnPlayerNPC(pn));
m.broadcastMessage(MaplePacketCreator.getPlayerNPC(pn));
m.broadcastMessage(PacketCreator.spawnPlayerNPC(pn));
m.broadcastMessage(PacketCreator.getPlayerNPC(pn));
}
return true;
@@ -577,8 +577,8 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
MapleMap m = channel.getMapFactory().getMap(mapid);
m.removeMapObject(pn);
m.broadcastMessage(MaplePacketCreator.removeNPCController(pn.getObjectId()));
m.broadcastMessage(MaplePacketCreator.removePlayerNPC(pn.getObjectId()));
m.broadcastMessage(PacketCreator.removeNPCController(pn.getObjectId()));
m.broadcastMessage(PacketCreator.removePlayerNPC(pn.getObjectId()));
}
}
}
@@ -615,8 +615,8 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
for (MapleMapObject pnpcObj : m.getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.PLAYER_NPC))) {
MaplePlayerNPC pn = (MaplePlayerNPC) pnpcObj;
m.removeMapObject(pnpcObj);
m.broadcastMessage(MaplePacketCreator.removeNPCController(pn.getObjectId()));
m.broadcastMessage(MaplePacketCreator.removePlayerNPC(pn.getObjectId()));
m.broadcastMessage(PacketCreator.removeNPCController(pn.getObjectId()));
m.broadcastMessage(PacketCreator.removePlayerNPC(pn.getObjectId()));
}
}
}

10
src/main/java/server/life/positioner/MaplePlayerNPCPodium.java
View File

@@ -26,7 +26,7 @@ import server.life.MaplePlayerNPC;
import server.maps.MapleMap;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.awt.*;
import java.util.ArrayList;
@@ -100,8 +100,8 @@ public class MaplePlayerNPCPodium {
for(MaplePlayerNPC pn : playerNpcs) {
m.removeMapObject(pn);
m.broadcastMessage(MaplePacketCreator.removeNPCController(pn.getObjectId()));
m.broadcastMessage(MaplePacketCreator.removePlayerNPC(pn.getObjectId()));
m.broadcastMessage(PacketCreator.removeNPCController(pn.getObjectId()));
m.broadcastMessage(PacketCreator.removePlayerNPC(pn.getObjectId()));
}
}
@@ -112,8 +112,8 @@ public class MaplePlayerNPCPodium {
for(MaplePlayerNPC pn : playerNpcs) {
m.addPlayerNPCMapObject(pn);
m.broadcastMessage(MaplePacketCreator.spawnPlayerNPC(pn));
m.broadcastMessage(MaplePacketCreator.getPlayerNPC(pn));
m.broadcastMessage(PacketCreator.spawnPlayerNPC(pn));
m.broadcastMessage(PacketCreator.getPlayerNPC(pn));
}
}

10
src/main/java/server/life/positioner/MaplePlayerNPCPositioner.java
View File

@@ -26,7 +26,7 @@ import server.life.MaplePlayerNPC;
import server.maps.MapleMap;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.awt.*;
import java.util.ArrayList;
@@ -152,8 +152,8 @@ public class MaplePlayerNPCPositioner {
for(MaplePlayerNPC pn : playerNpcs) {
m.removeMapObject(pn);
m.broadcastMessage(MaplePacketCreator.removeNPCController(pn.getObjectId()));
m.broadcastMessage(MaplePacketCreator.removePlayerNPC(pn.getObjectId()));
m.broadcastMessage(PacketCreator.removeNPCController(pn.getObjectId()));
m.broadcastMessage(PacketCreator.removePlayerNPC(pn.getObjectId()));
}
}
@@ -164,8 +164,8 @@ public class MaplePlayerNPCPositioner {
for(MaplePlayerNPC pn : playerNpcs) {
m.addPlayerNPCMapObject(pn);
m.broadcastMessage(MaplePacketCreator.spawnPlayerNPC(pn));
m.broadcastMessage(MaplePacketCreator.getPlayerNPC(pn));
m.broadcastMessage(PacketCreator.spawnPlayerNPC(pn));
m.broadcastMessage(PacketCreator.getPlayerNPC(pn));
}
}

25
src/main/java/server/maps/MapleDoorObject.java
View File

@@ -19,7 +19,6 @@
*/
package server.maps;
import java.awt.Point;
import client.MapleCharacter;
import client.MapleClient;
import net.server.audit.locks.MonitoredLockType;
@@ -29,7 +28,9 @@ import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import net.server.world.MapleParty;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.awt.*;
/**
*
@@ -90,7 +91,7 @@ public class MapleDoorObject extends AbstractMapleMapObject {
public void warp(final MapleCharacter chr) {
MapleParty party = chr.getParty();
if (chr.getId() == ownerId || (party != null && party.getMemberById(ownerId) != null)) {
chr.announce(MaplePacketCreator.playPortalSound());
chr.announce(PacketCreator.playPortalSound());
if(!inTown() && party == null) {
chr.changeMap(to, getLinkedPortalId());
@@ -98,8 +99,8 @@ public class MapleDoorObject extends AbstractMapleMapObject {
chr.changeMap(to, getLinkedPortalPosition());
}
} else {
chr.getClient().announce(MaplePacketCreator.blockedMessage(6));
chr.getClient().announce(MaplePacketCreator.enableActions());
chr.getClient().announce(PacketCreator.blockedMessage(6));
chr.getClient().announce(PacketCreator.enableActions());
}
}
@@ -112,12 +113,12 @@ public class MapleDoorObject extends AbstractMapleMapObject {
MapleCharacter chr = client.getPlayer();
if (this.getFrom().getId() == chr.getMapId()) {
if (chr.getParty() != null && (this.getOwnerId() == chr.getId() || chr.getParty().getMemberById(this.getOwnerId()) != null)) {
chr.announce(MaplePacketCreator.partyPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition()));
chr.announce(PacketCreator.partyPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition()));
}
chr.announce(MaplePacketCreator.spawnPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition()));
chr.announce(PacketCreator.spawnPortal(this.getFrom().getId(), this.getTo().getId(), this.toPosition()));
if (!this.inTown()) {
chr.announce(MaplePacketCreator.spawnDoor(this.getOwnerId(), this.getPosition(), launched));
chr.announce(PacketCreator.spawnDoor(this.getOwnerId(), this.getPosition(), launched));
}
}
}
@@ -128,16 +129,16 @@ public class MapleDoorObject extends AbstractMapleMapObject {
if (from.getId() == chr.getMapId()) {
MapleParty party = chr.getParty();
if (party != null && (ownerId == chr.getId() || party.getMemberById(ownerId) != null)) {
client.announce(MaplePacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
client.announce(PacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
}
client.announce(MaplePacketCreator.removeDoor(ownerId, inTown()));
client.announce(PacketCreator.removeDoor(ownerId, inTown()));
}
}
public void sendDestroyData(MapleClient client, boolean partyUpdate) {
if (client != null && from.getId() == client.getPlayer().getMapId()) {
client.announce(MaplePacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
client.announce(MaplePacketCreator.removeDoor(ownerId, inTown()));
client.announce(PacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
client.announce(PacketCreator.removeDoor(ownerId, inTown()));
}
}

6
src/main/java/server/maps/MapleDragon.java
View File

@@ -21,9 +21,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package server.maps;
import tools.MaplePacketCreator;
import client.MapleCharacter;
import client.MapleClient;
import tools.PacketCreator;
@@ -46,7 +46,7 @@ public class MapleDragon extends AbstractAnimatedMapleMapObject {
@Override
public void sendSpawnData(MapleClient client) {
client.announce(MaplePacketCreator.spawnDragon(this));
client.announce(PacketCreator.spawnDragon(this));
}
@Override
@@ -56,7 +56,7 @@ public class MapleDragon extends AbstractAnimatedMapleMapObject {
@Override
public void sendDestroyData(MapleClient c) {
c.announce(MaplePacketCreator.removeDragon(owner.getId()));
c.announce(PacketCreator.removeDragon(owner.getId()));
}
public MapleCharacter getOwner() {

11
src/main/java/server/maps/MapleGenericPortal.java
View File

@@ -21,15 +21,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package server.maps;
import client.MapleClient;
import client.MapleCharacter;
import client.MapleClient;
import constants.game.GameConstants;
import java.awt.Point;
import scripting.portal.PortalScriptManager;
import tools.MaplePacketCreator;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import scripting.portal.PortalScriptManager;
import tools.PacketCreator;
import java.awt.*;
public class MapleGenericPortal implements MaplePortal {
@@ -155,7 +156,7 @@ public class MapleGenericPortal implements MaplePortal {
}
}
if (!changed) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
}
}

50
src/main/java/server/maps/MapleHiredMerchant.java
View File

@@ -37,7 +37,7 @@ import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import server.MapleItemInformationProvider;
import server.MapleTrade;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.sql.Connection;
@@ -126,8 +126,8 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
int i = this.getFreeSlot();
if (i > -1) {
visitors[i] = visitor;
broadcastToVisitors(MaplePacketCreator.hiredMerchantVisitorAdd(visitor, i + 1));
this.getMap().broadcastMessage(MaplePacketCreator.updateHiredMerchantBox(this));
broadcastToVisitors(PacketCreator.hiredMerchantVisitorAdd(visitor, i + 1));
this.getMap().broadcastMessage(PacketCreator.updateHiredMerchantBox(this));
return true;
}
@@ -147,8 +147,8 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
}
if (visitors[slot] != null && visitors[slot].getId() == visitor.getId()) {
visitors[slot] = null;
broadcastToVisitors(MaplePacketCreator.hiredMerchantVisitorLeave(slot + 1));
this.getMap().broadcastMessage(MaplePacketCreator.updateHiredMerchantBox(this));
broadcastToVisitors(PacketCreator.hiredMerchantVisitorLeave(slot + 1));
this.getMap().broadcastMessage(PacketCreator.updateHiredMerchantBox(this));
}
} finally {
visitorLock.unlock();
@@ -182,14 +182,14 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
if (visitor != null) {
visitor.setHiredMerchant(null);
visitor.getClient().announce(MaplePacketCreator.leaveHiredMerchant(i + 1, 0x11));
visitor.getClient().announce(MaplePacketCreator.hiredMerchantMaintenanceMessage());
visitor.getClient().announce(PacketCreator.leaveHiredMerchant(i + 1, 0x11));
visitor.getClient().announce(PacketCreator.hiredMerchantMaintenanceMessage());
visitors[i] = null;
}
}
this.getMap().broadcastMessage(MaplePacketCreator.updateHiredMerchantBox(this));
this.getMap().broadcastMessage(PacketCreator.updateHiredMerchantBox(this));
} finally {
visitorLock.unlock();
}
@@ -197,8 +197,8 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
private void removeOwner(MapleCharacter owner) {
if (owner.getHiredMerchant() == this) {
owner.announce(MaplePacketCreator.hiredMerchantOwnerLeave());
owner.announce(MaplePacketCreator.leaveHiredMerchant(0x00, 0x03));
owner.announce(PacketCreator.hiredMerchantOwnerLeave());
owner.announce(PacketCreator.leaveHiredMerchant(0x00, 0x03));
owner.setHiredMerchant(null);
}
}
@@ -220,8 +220,8 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
iitem.setQuantity((short) (shopItem.getItem().getQuantity() * shopItem.getBundles()));
if (!MapleInventory.checkSpot(chr, iitem)) {
chr.announce(MaplePacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item."));
chr.announce(MaplePacketCreator.enableActions());
chr.announce(PacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item."));
chr.announce(PacketCreator.enableActions());
return;
}
@@ -229,7 +229,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
}
removeFromSlot(slot);
chr.announce(MaplePacketCreator.updateHiredMerchant(this, chr));
chr.announce(PacketCreator.updateHiredMerchant(this, chr));
}
if (YamlConfig.config.server.USE_ENFORCE_MERCHANT_SAVE) {
@@ -263,10 +263,10 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
newItem.setQuantity((short) ((pItem.getItem().getQuantity() * quantity)));
if (quantity < 1 || !pItem.isExist() || pItem.getBundles() < quantity) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
} else if (newItem.getInventoryType().equals(MapleInventoryType.EQUIP) && newItem.getQuantity() > 1) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
@@ -318,12 +318,12 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
}
} else {
c.getPlayer().dropMessage(1, "Your inventory is full. Please clear a slot before buying this item.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
} else {
c.getPlayer().dropMessage(1, "You don't have enough mesos to purchase this item.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return;
}
try {
@@ -345,7 +345,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
public void forceClose() {
//Server.getInstance().getChannel(world, channel).removeHiredMerchant(ownerId);
map.broadcastMessage(MaplePacketCreator.removeHiredMerchantBox(getOwnerId()));
map.broadcastMessage(PacketCreator.removeHiredMerchantBox(getOwnerId()));
map.removeMapObject(this);
MapleCharacter owner = Server.getInstance().getWorld(world).getPlayerStorage().getCharacterById(ownerId);
@@ -398,7 +398,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
private void closeShop(MapleClient c, boolean timeout) {
map.removeMapObject(this);
map.broadcastMessage(MaplePacketCreator.removeHiredMerchantBox(ownerId));
map.broadcastMessage(PacketCreator.removeHiredMerchantBox(ownerId));
c.getChannelServer().removeHiredMerchant(ownerId);
this.removeAllVisitors();
@@ -461,15 +461,15 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
this.setOpen(false);
this.removeAllVisitors();
chr.announce(MaplePacketCreator.getHiredMerchant(chr, this, false));
chr.announce(PacketCreator.getHiredMerchant(chr, this, false));
} else if (!this.isOpen()) {
chr.announce(MaplePacketCreator.getMiniRoomError(18));
chr.announce(PacketCreator.getMiniRoomError(18));
return;
} else if (!this.addVisitor(chr)) {
chr.announce(MaplePacketCreator.getMiniRoomError(2));
chr.announce(PacketCreator.getMiniRoomError(2));
return;
} else {
chr.announce(MaplePacketCreator.getHiredMerchant(chr, this, false));
chr.announce(PacketCreator.getHiredMerchant(chr, this, false));
}
chr.setHiredMerchant(this);
} finally {
@@ -599,7 +599,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
synchronized (messages) {
messages.add(new Pair<>(message, slot));
}
broadcastToVisitorsThreadsafe(MaplePacketCreator.hiredMerchantChat(message, slot));
broadcastToVisitorsThreadsafe(PacketCreator.hiredMerchantChat(message, slot));
}
public List<MaplePlayerShopItem> sendAvailableBundles(int itemid) {
@@ -713,7 +713,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
@Override
public void sendSpawnData(MapleClient client) {
client.announce(MaplePacketCreator.spawnHiredMerchantBox(this));
client.announce(PacketCreator.spawnHiredMerchantBox(this));
}
public class SoldItem {

9
src/main/java/server/maps/MapleKite.java
View File

@@ -1,9 +1,10 @@
package server.maps;
import java.awt.Point;
import client.MapleCharacter;
import client.MapleClient;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.awt.*;
public class MapleKite extends AbstractMapleMapObject {
@@ -51,10 +52,10 @@ public class MapleKite extends AbstractMapleMapObject {
}
public final byte[] makeSpawnData() {
return MaplePacketCreator.spawnKite(getObjectId(), itemid, owner.getName(), text, pos, ft);
return PacketCreator.spawnKite(getObjectId(), itemid, owner.getName(), text, pos, ft);
}
public final byte[] makeDestroyData() {
return MaplePacketCreator.removeKite(getObjectId(), 0);
return PacketCreator.removeKite(getObjectId(), 0);
}
}

140
src/main/java/server/maps/MapleMap.java
View File

@@ -62,7 +62,7 @@ import server.partyquest.GuardianSpawnPoint;
import server.partyquest.MapleCarnivalFactory;
import server.partyquest.MapleCarnivalFactory.MCSkill;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.Randomizer;
@@ -307,7 +307,7 @@ public class MapleMap {
mr.lockReactor();
try {
mr.resetReactorActions(1);
broadcastMessage(MaplePacketCreator.triggerReactor((MapleReactor) o, 1));
broadcastMessage(PacketCreator.triggerReactor((MapleReactor) o, 1));
} finally {
mr.unlockReactor();
}
@@ -1040,8 +1040,8 @@ public class MapleMap {
mdrop.setPartyOwnerId(partyid);
byte[] removePacket = MaplePacketCreator.silentRemoveItemFromMap(mdrop.getObjectId());
byte[] updatePacket = MaplePacketCreator.updateMapItemObject(mdrop, partyLeaver == null);
byte[] removePacket = PacketCreator.silentRemoveItemFromMap(mdrop.getObjectId());
byte[] updatePacket = PacketCreator.updateMapItemObject(mdrop, partyLeaver == null);
for (MapleCharacter mc : partyMembers) {
if (this.equals(mc.getMap())) {
@@ -1058,7 +1058,7 @@ public class MapleMap {
partyLeaver.announce(removePacket);
if (partyLeaver.needQuestItem(mdrop.getQuest(), mdrop.getItemId())) {
partyLeaver.announce(MaplePacketCreator.updateMapItemObject(mdrop, true));
partyLeaver.announce(PacketCreator.updateMapItemObject(mdrop, true));
}
}
}
@@ -1081,8 +1081,8 @@ public class MapleMap {
continue;
}
byte[] removePacket = MaplePacketCreator.silentRemoveItemFromMap(mdrop.getObjectId());
byte[] updatePacket = MaplePacketCreator.updateMapItemObject(mdrop, true);
byte[] removePacket = PacketCreator.silentRemoveItemFromMap(mdrop.getObjectId());
byte[] updatePacket = PacketCreator.updateMapItemObject(mdrop, true);
if (newcomer != null) {
if (this.equals(newcomer.getMap())) {
@@ -1108,7 +1108,7 @@ public class MapleMap {
if (chr1.needQuestItem(questid, idrop.getItemId())) {
mdrop.lockItem();
try {
c.announce(MaplePacketCreator.dropItemFromMapObject(chr1, mdrop, dropper.getPosition(), dropPos, (byte) 1));
c.announce(PacketCreator.dropItemFromMapObject(chr1, mdrop, dropper.getPosition(), dropPos, (byte) 1));
} finally {
mdrop.unlockItem();
}
@@ -1127,7 +1127,7 @@ public class MapleMap {
spawnAndAddRangedMapObject(mdrop, c -> {
mdrop.lockItem();
try {
c.announce(MaplePacketCreator.dropItemFromMapObject(c.getPlayer(), mdrop, dropper.getPosition(), droppos, (byte) 1));
c.announce(PacketCreator.dropItemFromMapObject(c.getPlayer(), mdrop, dropper.getPosition(), droppos, (byte) 1));
} finally {
mdrop.unlockItem();
}
@@ -1379,7 +1379,7 @@ public class MapleMap {
if (chr == null) {
if (removeKilledMonsterObject(monster)) {
monster.dispatchMonsterKilled(false);
broadcastMessage(MaplePacketCreator.killMonster(monster.getObjectId(), animation), monster.getPosition());
broadcastMessage(PacketCreator.killMonster(monster.getObjectId(), animation), monster.getPosition());
monster.aggroSwitchController(null, false);
}
} else {
@@ -1407,8 +1407,8 @@ public class MapleMap {
MapleCharacter character = (MapleCharacter) mmo;
if (character.isAlive()) {
MapleStatEffect statEffect = mii.getItemEffect(buff);
character.getClient().announce(MaplePacketCreator.showOwnBuffEffect(buff, 1));
broadcastMessage(character, MaplePacketCreator.showBuffeffect(character.getId(), buff, 1), false);
character.getClient().announce(PacketCreator.showOwnBuffEffect(buff, 1));
broadcastMessage(character, PacketCreator.showBuffeffect(character.getId(), buff, 1), false);
statEffect.applyTo(character);
}
}
@@ -1460,7 +1460,7 @@ public class MapleMap {
e.printStackTrace();
} finally { // thanks resinate for pointing out a memory leak possibly from an exception thrown
monster.dispatchMonsterKilled(true);
broadcastMessage(MaplePacketCreator.killMonster(monster.getObjectId(), animation), monster.getPosition());
broadcastMessage(PacketCreator.killMonster(monster.getObjectId(), animation), monster.getPosition());
}
}
}
@@ -1593,7 +1593,7 @@ public class MapleMap {
try {
r.resetReactorActions(0);
r.setAlive(true);
broadcastMessage(MaplePacketCreator.triggerReactor(r, 0));
broadcastMessage(PacketCreator.triggerReactor(r, 0));
} finally {
r.unlockReactor();
}
@@ -1727,8 +1727,8 @@ public class MapleMap {
try {
for (MapleMapObject obj : npcs) {
if (((MapleNPC) obj).getId() == npcid) {
broadcastMessage(MaplePacketCreator.removeNPCController(obj.getObjectId()));
broadcastMessage(MaplePacketCreator.removeNPC(obj.getObjectId()));
broadcastMessage(PacketCreator.removeNPCController(obj.getObjectId()));
broadcastMessage(PacketCreator.removeNPC(obj.getObjectId()));
this.mapobjects.remove(obj.getObjectId());
}
@@ -1867,7 +1867,7 @@ public class MapleMap {
getEventInstance().registerMonster(monster);
}
spawnAndAddRangedMapObject(monster, c -> c.announce(MaplePacketCreator.spawnMonster(monster, false)));
spawnAndAddRangedMapObject(monster, c -> c.announce(PacketCreator.spawnMonster(monster, false)));
monster.aggroUpdateController();
updateBossSpawn(monster);
@@ -1954,7 +1954,7 @@ public class MapleMap {
getEventInstance().registerMonster(monster);
}
spawnAndAddRangedMapObject(monster, c -> c.announce(MaplePacketCreator.spawnMonster(monster, true)), null);
spawnAndAddRangedMapObject(monster, c -> c.announce(PacketCreator.spawnMonster(monster, true)), null);
monster.aggroUpdateController();
updateBossSpawn(monster);
@@ -2015,7 +2015,7 @@ public class MapleMap {
monster.setPosition(spos);
monster.setSpawnEffect(effect);
spawnAndAddRangedMapObject(monster, c -> c.announce(MaplePacketCreator.spawnMonster(monster, true, effect)));
spawnAndAddRangedMapObject(monster, c -> c.announce(PacketCreator.spawnMonster(monster, true, effect)));
monster.aggroUpdateController();
updateBossSpawn(monster);
@@ -2028,7 +2028,7 @@ public class MapleMap {
public void spawnFakeMonster(final MapleMonster monster) {
monster.setMap(this);
monster.setFake(true);
spawnAndAddRangedMapObject(monster, c -> c.announce(MaplePacketCreator.spawnFakeMonster(monster, 0)));
spawnAndAddRangedMapObject(monster, c -> c.announce(PacketCreator.spawnFakeMonster(monster, 0)));
spawnedMonstersOnMap.incrementAndGet();
addSelfDestructive(monster);
@@ -2036,7 +2036,7 @@ public class MapleMap {
public void makeMonsterReal(final MapleMonster monster) {
monster.setFake(false);
broadcastMessage(MaplePacketCreator.makeMonsterReal(monster));
broadcastMessage(PacketCreator.makeMonsterReal(monster));
monster.aggroUpdateController();
updateBossSpawn(monster);
}
@@ -2069,7 +2069,7 @@ public class MapleMap {
public void spawnSummon(final MapleSummon summon) {
spawnAndAddRangedMapObject(summon, c -> {
if (summon != null) {
c.announce(MaplePacketCreator.spawnSummon(summon, true));
c.announce(PacketCreator.spawnSummon(summon, true));
}
}, null);
}
@@ -2148,7 +2148,7 @@ public class MapleMap {
spawnAndAddRangedMapObject(mdrop, c -> {
mdrop.lockItem();
try {
c.announce(MaplePacketCreator.dropItemFromMapObject(c.getPlayer(), mdrop, dropper.getPosition(), droppos, (byte) 1));
c.announce(PacketCreator.dropItemFromMapObject(c.getPlayer(), mdrop, dropper.getPosition(), droppos, (byte) 1));
} finally {
mdrop.unlockItem();
}
@@ -2268,7 +2268,7 @@ public class MapleMap {
}
public void changeEnvironment(String mapObj, int newState) {
broadcastMessage(MaplePacketCreator.environmentChange(mapObj, newState));
broadcastMessage(PacketCreator.environmentChange(mapObj, newState));
}
public void startMapEffect(String msg, int itemId) {
@@ -2402,7 +2402,7 @@ public class MapleMap {
if (mapid == 200090060) { // To Rien
int travelTime = getWorldServer().getTransportationTime(1 * 60 * 1000);
chr.announce(MaplePacketCreator.getClock(travelTime / 1000));
chr.announce(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090060) {
chr.changeMap(140020300, 0);
@@ -2410,7 +2410,7 @@ public class MapleMap {
}, travelTime);
} else if (mapid == 200090070) { // To Lith Harbor
int travelTime = getWorldServer().getTransportationTime(1 * 60 * 1000);
chr.announce(MaplePacketCreator.getClock(travelTime / 1000));
chr.announce(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090070) {
chr.changeMap(104000000, 3);
@@ -2418,7 +2418,7 @@ public class MapleMap {
}, travelTime);
} else if (mapid == 200090030) { // To Ereve (SkyFerry)
int travelTime = getWorldServer().getTransportationTime(2 * 60 * 1000);
chr.announce(MaplePacketCreator.getClock(travelTime / 1000));
chr.announce(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090030) {
chr.changeMap(130000210, 0);
@@ -2426,7 +2426,7 @@ public class MapleMap {
}, travelTime);
} else if (mapid == 200090031) { // To Victoria Island (SkyFerry)
int travelTime = getWorldServer().getTransportationTime(2 * 60 * 1000);
chr.announce(MaplePacketCreator.getClock(travelTime / 1000));
chr.announce(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090031) {
chr.changeMap(101000400, 0);
@@ -2434,7 +2434,7 @@ public class MapleMap {
}, travelTime);
} else if (mapid == 200090021) { // To Orbis (SkyFerry)
int travelTime = getWorldServer().getTransportationTime(8 * 60 * 1000);
chr.announce(MaplePacketCreator.getClock(travelTime / 1000));
chr.announce(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090021) {
chr.changeMap(200000161, 0);
@@ -2442,7 +2442,7 @@ public class MapleMap {
}, travelTime);
} else if (mapid == 200090020) { // To Ereve From Orbis (SkyFerry)
int travelTime = getWorldServer().getTransportationTime(8 * 60 * 1000);
chr.announce(MaplePacketCreator.getClock(travelTime / 1000));
chr.announce(PacketCreator.getClock(travelTime / 1000));
TimerManager.getInstance().schedule(() -> {
if (chr.getMapId() == 200090020) {
chr.changeMap(130000210, 0);
@@ -2455,14 +2455,14 @@ public class MapleMap {
}
} else if (GameConstants.isAriantColiseumArena(mapid)) {
int pqTimer = (10 * 60 * 1000);
chr.announce(MaplePacketCreator.getClock(pqTimer / 1000));
chr.announce(PacketCreator.getClock(pqTimer / 1000));
}
MaplePet[] pets = chr.getPets();
for (MaplePet pet : pets) {
if (pet != null) {
pet.setPos(getGroundBelow(chr.getPosition()));
chr.announce(MaplePacketCreator.showPet(chr, pet, false, false));
chr.announce(PacketCreator.showPet(chr, pet, false, false));
} else {
break;
}
@@ -2470,7 +2470,7 @@ public class MapleMap {
chr.commitExcludedItems(); // thanks OishiiKawaiiDesu for noticing pet item ignore registry erasing upon changing maps
if (chr.getMonsterCarnival() != null) {
chr.getClient().announce(MaplePacketCreator.getClock(chr.getMonsterCarnival().getTimeLeftSeconds()));
chr.getClient().announce(PacketCreator.getClock(chr.getMonsterCarnival().getTimeLeftSeconds()));
if (isCPQMap()) {
int team = -1;
int oposition = -1;
@@ -2482,7 +2482,7 @@ public class MapleMap {
team = 1;
oposition = 0;
}
chr.getClient().announce(MaplePacketCreator.startMonsterCarnival(chr, team, oposition));
chr.getClient().announce(PacketCreator.startMonsterCarnival(chr, team, oposition));
}
}
@@ -2490,7 +2490,7 @@ public class MapleMap {
if (chr.getChalkboard() != null) {
if (!GameConstants.isFreeMarketRoom(mapid)) {
chr.announce(MaplePacketCreator.useChalkboard(chr, false)); // update player's chalkboard when changing maps found thanks to Vcoc
chr.announce(PacketCreator.useChalkboard(chr, false)); // update player's chalkboard when changing maps found thanks to Vcoc
} else {
chr.setChalkboard(null);
}
@@ -2498,10 +2498,10 @@ public class MapleMap {
if (chr.isHidden()) {
broadcastGMSpawnPlayerMapObjectMessage(chr, chr, true);
chr.announce(MaplePacketCreator.getGMEffect(0x10, (byte) 1));
chr.announce(PacketCreator.getGMEffect(0x10, (byte) 1));
List<Pair<MapleBuffStat, Integer>> dsstat = Collections.singletonList(new Pair<>(MapleBuffStat.DARKSIGHT, 0));
broadcastGMMessage(chr, MaplePacketCreator.giveForeignBuff(chr.getId(), dsstat), false);
broadcastGMMessage(chr, PacketCreator.giveForeignBuff(chr.getId(), dsstat), false);
} else {
broadcastSpawnPlayerMapObjectMessage(chr, chr, true);
}
@@ -2512,11 +2512,11 @@ public class MapleMap {
chr.getMap().getPortal("join00").setPortalStatus(false);
}
if (hasForcedEquip()) {
chr.getClient().announce(MaplePacketCreator.showForcedEquip(-1));
chr.getClient().announce(PacketCreator.showForcedEquip(-1));
}
if (specialEquip()) {
chr.getClient().announce(MaplePacketCreator.coconutScore(0, 0));
chr.getClient().announce(MaplePacketCreator.showForcedEquip(chr.getTeam()));
chr.getClient().announce(PacketCreator.coconutScore(0, 0));
chr.getClient().announce(PacketCreator.showForcedEquip(chr.getTeam()));
}
objectWLock.lock();
try {
@@ -2534,9 +2534,9 @@ public class MapleMap {
dragon.setPosition(chr.getPosition());
this.addMapObject(dragon);
if (chr.isHidden()) {
this.broadcastGMMessage(chr, MaplePacketCreator.spawnDragon(dragon));
this.broadcastGMMessage(chr, PacketCreator.spawnDragon(dragon));
} else {
this.broadcastMessage(chr, MaplePacketCreator.spawnDragon(dragon));
this.broadcastMessage(chr, PacketCreator.spawnDragon(dragon));
}
}
@@ -2550,34 +2550,34 @@ public class MapleMap {
if (mapEffect != null) {
mapEffect.sendStartData(chr.getClient());
}
chr.getClient().announce(MaplePacketCreator.resetForcedStats());
chr.getClient().announce(PacketCreator.resetForcedStats());
if (mapid == 914000200 || mapid == 914000210 || mapid == 914000220) {
chr.getClient().announce(MaplePacketCreator.aranGodlyStats());
chr.getClient().announce(PacketCreator.aranGodlyStats());
}
if (chr.getEventInstance() != null && chr.getEventInstance().isTimerStarted()) {
chr.getClient().announce(MaplePacketCreator.getClock((int) (chr.getEventInstance().getTimeLeft() / 1000)));
chr.getClient().announce(PacketCreator.getClock((int) (chr.getEventInstance().getTimeLeft() / 1000)));
}
if (chr.getFitness() != null && chr.getFitness().isTimerStarted()) {
chr.getClient().announce(MaplePacketCreator.getClock((int) (chr.getFitness().getTimeLeft() / 1000)));
chr.getClient().announce(PacketCreator.getClock((int) (chr.getFitness().getTimeLeft() / 1000)));
}
if (chr.getOla() != null && chr.getOla().isTimerStarted()) {
chr.getClient().announce(MaplePacketCreator.getClock((int) (chr.getOla().getTimeLeft() / 1000)));
chr.getClient().announce(PacketCreator.getClock((int) (chr.getOla().getTimeLeft() / 1000)));
}
if (mapid == 109060000) {
chr.announce(MaplePacketCreator.rollSnowBall(true, 0, null, null));
chr.announce(PacketCreator.rollSnowBall(true, 0, null, null));
}
if (hasClock()) {
Calendar cal = Calendar.getInstance();
chr.getClient().announce((MaplePacketCreator.getClockTime(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND))));
chr.getClient().announce((PacketCreator.getClockTime(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND))));
}
if (hasBoat() > 0) {
if (hasBoat() == 1) {
chr.getClient().announce((MaplePacketCreator.boatPacket(true)));
chr.getClient().announce((PacketCreator.boatPacket(true)));
} else {
chr.getClient().announce(MaplePacketCreator.boatPacket(false));
chr.getClient().announce(PacketCreator.boatPacket(false));
}
}
@@ -2697,9 +2697,9 @@ public class MapleMap {
removeMapObject(chr.getObjectId());
if (!chr.isHidden()) {
broadcastMessage(MaplePacketCreator.removePlayerFromMap(chr.getId()));
broadcastMessage(PacketCreator.removePlayerFromMap(chr.getId()));
} else {
broadcastGMMessage(MaplePacketCreator.removePlayerFromMap(chr.getId()));
broadcastGMMessage(PacketCreator.removePlayerFromMap(chr.getId()));
}
chr.leaveMap();
@@ -2715,9 +2715,9 @@ public class MapleMap {
if (chr.getDragon() != null) {
removeMapObject(chr.getDragon());
if (chr.isHidden()) {
this.broadcastGMMessage(chr, MaplePacketCreator.removeDragon(chr.getId()));
this.broadcastGMMessage(chr, PacketCreator.removeDragon(chr.getId()));
} else {
this.broadcastMessage(chr, MaplePacketCreator.removeDragon(chr.getId()));
this.broadcastMessage(chr, PacketCreator.removeDragon(chr.getId()));
}
}
}
@@ -2847,7 +2847,7 @@ public class MapleMap {
chrRLock.lock();
try {
for (MapleCharacter chr : characters) {
final byte[] packet = MaplePacketCreator.dropItemFromMapObject(chr, mdrop, dropperPos, dropPos, mod);
final byte[] packet = PacketCreator.dropItemFromMapObject(chr, mdrop, dropperPos, dropPos, mod);
if (rangeSq < Double.POSITIVE_INFINITY) {
if (rangedFrom.distanceSq(chr.getPosition()) <= rangeSq) {
@@ -2877,14 +2877,14 @@ public class MapleMap {
for (MapleCharacter chr : characters) {
if (chr.isGM()) {
if (chr != source) {
chr.announce(MaplePacketCreator.spawnPlayerMapObject(chr.getClient(), player, enteringField));
chr.announce(PacketCreator.spawnPlayerMapObject(chr.getClient(), player, enteringField));
}
}
}
} else {
for (MapleCharacter chr : characters) {
if (chr != source) {
chr.announce(MaplePacketCreator.spawnPlayerMapObject(chr.getClient(), player, enteringField));
chr.announce(PacketCreator.spawnPlayerMapObject(chr.getClient(), player, enteringField));
}
}
}
@@ -2898,7 +2898,7 @@ public class MapleMap {
try {
for (MapleCharacter chr : characters) {
if (chr != source) {
chr.announce(MaplePacketCreator.updateCharLook(chr.getClient(), player));
chr.announce(PacketCreator.updateCharLook(chr.getClient(), player));
}
}
} finally {
@@ -2911,7 +2911,7 @@ public class MapleMap {
}
public void broadcastStringMessage(int type, String message) {
broadcastMessage(MaplePacketCreator.serverNotice(type, message));
broadcastMessage(PacketCreator.serverNotice(type, message));
}
private static boolean isNonRangedType(MapleMapObjectType type) {
@@ -3234,7 +3234,7 @@ public class MapleMap {
}
public final void moveEnvironment(final String ms, final int type) {
broadcastMessage(MaplePacketCreator.environmentMove(ms, type));
broadcastMessage(PacketCreator.environmentMove(ms, type));
objectWLock.lock();
try {
@@ -3317,7 +3317,7 @@ public class MapleMap {
public void sendNightEffect(MapleCharacter mc) {
for (Entry<Integer, Integer> types : backgroundTypes.entrySet()) {
if (types.getValue() >= 3) { // 3 is a special number
mc.announce(MaplePacketCreator.changeBackgroundEffect(true, types.getKey(), 0));
mc.announce(PacketCreator.changeBackgroundEffect(true, types.getKey(), 0));
}
}
}
@@ -3363,7 +3363,7 @@ public class MapleMap {
return true;
}
MapleMap.this.pickItemDrop(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 0, 0), mapitem);
MapleMap.this.pickItemDrop(PacketCreator.removeItemFromMap(mapitem.getObjectId(), 0, 0), mapitem);
return true;
} finally {
mapitem.unlockItem();
@@ -3442,7 +3442,7 @@ public class MapleMap {
unregisterItemDrop(mapitem);
reactor.setShouldCollect(false);
MapleMap.this.broadcastMessage(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 0, 0), mapitem.getPosition());
MapleMap.this.broadcastMessage(PacketCreator.removeItemFromMap(mapitem.getObjectId(), 0, 0), mapitem.getPosition());
droppedItemCount.decrementAndGet();
MapleMap.this.removeMapObject(mapitem);
@@ -3458,7 +3458,7 @@ public class MapleMap {
try {
reactor.resetReactorActions(0);
reactor.setAlive(true);
broadcastMessage(MaplePacketCreator.triggerReactor(reactor, 0));
broadcastMessage(PacketCreator.triggerReactor(reactor, 0));
} finally {
reactor.unlockReactor();
}
@@ -3803,7 +3803,7 @@ public class MapleMap {
for (MapleMapObject i : getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM))) {
droppedItemCount.decrementAndGet();
removeMapObject(i);
this.broadcastMessage(MaplePacketCreator.removeItemFromMap(i.getObjectId(), 0, player.getId()));
this.broadcastMessage(PacketCreator.removeItemFromMap(i.getObjectId(), 0, player.getId()));
}
}
@@ -3811,7 +3811,7 @@ public class MapleMap {
for (MapleMapObject i : getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM))) {
droppedItemCount.decrementAndGet();
removeMapObject(i);
this.broadcastMessage(MaplePacketCreator.removeItemFromMap(i.getObjectId(), 0, 0));
this.broadcastMessage(PacketCreator.removeItemFromMap(i.getObjectId(), 0, 0));
}
}
@@ -3976,7 +3976,7 @@ public class MapleMap {
npc.setHide(!npc.isHidden());
if (!npc.isHidden()) //Should only be hidden upon changing maps
{
broadcastMessage(MaplePacketCreator.spawnNPC(npc));
broadcastMessage(PacketCreator.spawnNPC(npc));
}
}
}
@@ -4025,12 +4025,12 @@ public class MapleMap {
}
public void broadcastShip(final boolean state) {
broadcastMessage(MaplePacketCreator.boatPacket(state));
broadcastMessage(PacketCreator.boatPacket(state));
this.setDocked(state);
}
public void broadcastEnemyShip(final boolean state) {
broadcastMessage(MaplePacketCreator.crogBoatPacket(state));
broadcastMessage(PacketCreator.crogBoatPacket(state));
this.setDocked(state);
}

6
src/main/java/server/maps/MapleMapEffect.java
View File

@@ -22,7 +22,7 @@
package server.maps;
import client.MapleClient;
import tools.MaplePacketCreator;
import tools.PacketCreator;
public class MapleMapEffect {
private String msg;
@@ -35,11 +35,11 @@ public class MapleMapEffect {
}
public final byte[] makeDestroyData() {
return MaplePacketCreator.removeMapEffect();
return PacketCreator.removeMapEffect();
}
public final byte[] makeStartData() {
return MaplePacketCreator.startMapEffect(msg, itemId, active);
return PacketCreator.startMapEffect(msg, itemId, active);
}
public void sendStartData(MapleClient client) {

11
src/main/java/server/maps/MapleMapItem.java
View File

@@ -23,11 +23,12 @@ package server.maps;
import client.MapleCharacter;
import client.MapleClient;
import client.inventory.Item;
import java.awt.Point;
import java.util.concurrent.locks.Lock;
import tools.MaplePacketCreator;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import tools.PacketCreator;
import java.awt.*;
import java.util.concurrent.locks.Lock;
public class MapleMapItem extends AbstractMapleMapObject {
protected MapleClient ownerClient;
@@ -202,7 +203,7 @@ public class MapleMapItem extends AbstractMapleMapObject {
if (chr.needQuestItem(questid, getItemId())) {
this.lockItem();
try {
client.announce(MaplePacketCreator.dropItemFromMapObject(chr, this, null, getPosition(), (byte) 2));
client.announce(PacketCreator.dropItemFromMapObject(chr, this, null, getPosition(), (byte) 2));
} finally {
this.unlockItem();
}
@@ -211,6 +212,6 @@ public class MapleMapItem extends AbstractMapleMapObject {
@Override
public void sendDestroyData(final MapleClient client) {
client.announce(MaplePacketCreator.removeItemFromMap(getObjectId(), 1, 0));
client.announce(PacketCreator.removeItemFromMap(getObjectId(), 1, 0));
}
}

6
src/main/java/server/maps/MapleMiniDungeon.java
View File

@@ -23,7 +23,7 @@ import client.MapleCharacter;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import server.TimerManager;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.ArrayList;
import java.util.List;
@@ -53,7 +53,7 @@ public class MapleMiniDungeon {
public boolean registerPlayer(MapleCharacter chr) {
int time = (int)((expireTime - System.currentTimeMillis()) / 1000);
if(time > 0) chr.getClient().announce(MaplePacketCreator.getClock(time));
if(time > 0) chr.getClient().announce(PacketCreator.getClock(time));
lock.lock();
try {
@@ -68,7 +68,7 @@ public class MapleMiniDungeon {
}
public boolean unregisterPlayer(MapleCharacter chr) {
chr.getClient().announce(MaplePacketCreator.removeClock());
chr.getClient().announce(PacketCreator.removeClock());
lock.lock();
try {

40
src/main/java/server/maps/MapleMiniGame.java
View File

@@ -24,7 +24,7 @@ package server.maps;
import client.MapleCharacter;
import client.MapleClient;
import net.server.Server;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.ArrayList;
import java.util.Collections;
@@ -107,21 +107,21 @@ public class MapleMiniGame extends AbstractMapleMapObject {
MapleCharacter owner = this.getOwner();
if (GameType == MiniGameType.OMOK) {
owner.announce(MaplePacketCreator.getMiniGameNewVisitor(this, challenger, 1));
owner.getMap().broadcastMessage(MaplePacketCreator.addOmokBox(owner, 2, 0));
owner.announce(PacketCreator.getMiniGameNewVisitor(this, challenger, 1));
owner.getMap().broadcastMessage(PacketCreator.addOmokBox(owner, 2, 0));
} else if (GameType == MiniGameType.MATCH_CARD) {
owner.announce(MaplePacketCreator.getMatchCardNewVisitor(this, challenger, 1));
owner.getMap().broadcastMessage(MaplePacketCreator.addMatchCardBox(owner, 2, 0));
owner.announce(PacketCreator.getMatchCardNewVisitor(this, challenger, 1));
owner.getMap().broadcastMessage(PacketCreator.addMatchCardBox(owner, 2, 0));
}
}
public void closeRoom(boolean forceClose) {
owner.getMap().broadcastMessage(MaplePacketCreator.removeMinigameBox(owner));
owner.getMap().broadcastMessage(PacketCreator.removeMinigameBox(owner));
if (forceClose) {
this.broadcastToOwner(MaplePacketCreator.getMiniGameClose(false, 4));
this.broadcastToOwner(PacketCreator.getMiniGameClose(false, 4));
}
this.broadcastToVisitor(MaplePacketCreator.getMiniGameClose(true, 3));
this.broadcastToVisitor(PacketCreator.getMiniGameClose(true, 3));
if (visitor != null) {
visitor.setMiniGame(null);
@@ -135,17 +135,17 @@ public class MapleMiniGame extends AbstractMapleMapObject {
public void removeVisitor(boolean forceClose, MapleCharacter challenger) {
if (visitor == challenger) {
if (forceClose) {
visitor.announce(MaplePacketCreator.getMiniGameClose(true, 4));
visitor.announce(PacketCreator.getMiniGameClose(true, 4));
}
challenger.setMiniGame(null);
visitor = null;
this.getOwner().getClient().announce(MaplePacketCreator.getMiniGameRemoveVisitor());
this.getOwner().getClient().announce(PacketCreator.getMiniGameRemoveVisitor());
if (GameType == MiniGameType.OMOK) {
this.getOwner().getMap().broadcastMessage(MaplePacketCreator.addOmokBox(owner, 1, 0));
this.getOwner().getMap().broadcastMessage(PacketCreator.addOmokBox(owner, 1, 0));
} else if (GameType == MiniGameType.MATCH_CARD) {
this.getOwner().getMap().broadcastMessage(MaplePacketCreator.addMatchCardBox(owner, 1, 0));
this.getOwner().getMap().broadcastMessage(PacketCreator.addMatchCardBox(owner, 1, 0));
}
}
}
@@ -176,7 +176,7 @@ public class MapleMiniGame extends AbstractMapleMapObject {
}
private void updateMiniGameBox() {
this.getOwner().getMap().broadcastMessage(MaplePacketCreator.addOmokBox(owner, visitor != null ? 2 : 1, inprogress));
this.getOwner().getMap().broadcastMessage(PacketCreator.addOmokBox(owner, visitor != null ? 2 : 1, inprogress));
}
private synchronized boolean minigameMatchFinish() {
@@ -241,7 +241,7 @@ public class MapleMiniGame extends AbstractMapleMapObject {
visitorscore += (15 * (forfeit ? -1 : 1));
if (forfeit) visitorforfeits++;
this.broadcast(MaplePacketCreator.getMiniGameOwnerWin(this, forfeit));
this.broadcast(PacketCreator.getMiniGameOwnerWin(this, forfeit));
minigameMatchFinished();
}
@@ -255,7 +255,7 @@ public class MapleMiniGame extends AbstractMapleMapObject {
ownerscore += (15 * (forfeit ? -1 : 1));
if (forfeit) ownerforfeits++;
this.broadcast(MaplePacketCreator.getMiniGameVisitorWin(this, forfeit));
this.broadcast(PacketCreator.getMiniGameVisitorWin(this, forfeit));
minigameMatchFinished();
}
@@ -273,7 +273,7 @@ public class MapleMiniGame extends AbstractMapleMapObject {
nextavailabletie = timeNow + 5 * 60 * 1000;
}
this.broadcast(MaplePacketCreator.getMiniGameTie(this));
this.broadcast(PacketCreator.getMiniGameTie(this));
minigameMatchFinished();
}
@@ -390,15 +390,15 @@ public class MapleMiniGame extends AbstractMapleMapObject {
}
public void chat(MapleClient c, String chat) {
broadcast(MaplePacketCreator.getPlayerShopChat(c.getPlayer(), chat, isOwner(c.getPlayer())));
broadcast(PacketCreator.getPlayerShopChat(c.getPlayer(), chat, isOwner(c.getPlayer())));
}
public void sendOmok(MapleClient c, int type) {
c.announce(MaplePacketCreator.getMiniGame(c, this, isOwner(c.getPlayer()), type));
c.announce(PacketCreator.getMiniGame(c, this, isOwner(c.getPlayer()), type));
}
public void sendMatchCard(MapleClient c, int type) {
c.announce(MaplePacketCreator.getMatchCard(c, this, isOwner(c.getPlayer()), type));
c.announce(PacketCreator.getMatchCard(c, this, isOwner(c.getPlayer()), type));
}
public MapleCharacter getOwner() {
@@ -413,7 +413,7 @@ public class MapleMiniGame extends AbstractMapleMapObject {
int slot = move2 * 15 + move1 + 1;
if (piece[slot] == 0) {
piece[slot] = type;
this.broadcast(MaplePacketCreator.getMiniGameMoveOmok(this, move1, move2, type));
this.broadcast(PacketCreator.getMiniGameMoveOmok(this, move1, move2, type));
for (int y = 0; y < 15; y++) {
for (int x = 0; x < 11; x++) {
if (searchCombo(x, y, type)) {

24
src/main/java/server/maps/MapleMist.java
View File

@@ -25,19 +25,13 @@ import client.MapleCharacter;
import client.MapleClient;
import client.Skill;
import client.SkillFactory;
import java.awt.Point;
import java.awt.Rectangle;
import constants.skills.BlazeWizard;
import constants.skills.Evan;
import constants.skills.FPMage;
import constants.skills.NightWalker;
import constants.skills.Shadower;
import constants.skills.*;
import server.MapleStatEffect;
import server.life.MapleMonster;
import server.life.MobSkill;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.awt.*;
/**
*
@@ -135,21 +129,21 @@ public class MapleMist extends AbstractMapleMapObject {
}
public final byte[] makeDestroyData() {
return MaplePacketCreator.removeMist(getObjectId());
return PacketCreator.removeMist(getObjectId());
}
public final byte[] makeSpawnData() {
if (owner != null) {
return MaplePacketCreator.spawnMist(getObjectId(), owner.getId(), getSourceSkill().getId(), owner.getSkillLevel(SkillFactory.getSkill(source.getSourceId())), this);
return PacketCreator.spawnMist(getObjectId(), owner.getId(), getSourceSkill().getId(), owner.getSkillLevel(SkillFactory.getSkill(source.getSourceId())), this);
}
return MaplePacketCreator.spawnMist(getObjectId(), mob.getId(), skill.getSkillId(), skill.getSkillLevel(), this);
return PacketCreator.spawnMist(getObjectId(), mob.getId(), skill.getSkillId(), skill.getSkillLevel(), this);
}
public final byte[] makeFakeSpawnData(int level) {
if (owner != null) {
return MaplePacketCreator.spawnMist(getObjectId(), owner.getId(), getSourceSkill().getId(), level, this);
return PacketCreator.spawnMist(getObjectId(), owner.getId(), getSourceSkill().getId(), level, this);
}
return MaplePacketCreator.spawnMist(getObjectId(), mob.getId(), skill.getSkillId(), skill.getSkillLevel(), this);
return PacketCreator.spawnMist(getObjectId(), mob.getId(), skill.getSkillId(), skill.getSkillLevel(), this);
}
@Override

56
src/main/java/server/maps/MaplePlayerShop.java
View File

@@ -32,7 +32,7 @@ import net.opcodes.SendOpcode;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import server.MapleTrade;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.data.output.MaplePacketLittleEndianWriter;
@@ -126,8 +126,8 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
visitors[i] = visitor;
visitor.setSlot(i);
this.broadcast(MaplePacketCreator.getPlayerShopNewVisitor(visitor, i + 1));
owner.getMap().broadcastMessage(MaplePacketCreator.updatePlayerShopBox(this));
this.broadcast(PacketCreator.getPlayerShopNewVisitor(visitor, i + 1));
owner.getMap().broadcastMessage(PacketCreator.updatePlayerShopBox(this));
break;
}
}
@@ -147,8 +147,8 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
visitors[i] = null;
visitor.setSlot(-1);
this.broadcast(MaplePacketCreator.getPlayerShopRemoveVisitor(i + 1));
owner.getMap().broadcastMessage(MaplePacketCreator.updatePlayerShopBox(this));
this.broadcast(PacketCreator.getPlayerShopRemoveVisitor(i + 1));
owner.getMap().broadcastMessage(PacketCreator.updatePlayerShopBox(this));
return;
}
}
@@ -169,17 +169,17 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
visitor.setSlot(-1); //absolutely cant remove player slot for late players without dc'ing them... heh
for(int j = i; j < 2; j++) {
if(visitors[j] != null) owner.announce(MaplePacketCreator.getPlayerShopRemoveVisitor(j + 1));
if(visitors[j] != null) owner.announce(PacketCreator.getPlayerShopRemoveVisitor(j + 1));
visitors[j] = visitors[j + 1];
if(visitors[j] != null) visitors[j].setSlot(j);
}
visitors[2] = null;
for(int j = i; j < 2; j++) {
if(visitors[j] != null) owner.announce(MaplePacketCreator.getPlayerShopNewVisitor(visitors[j], j + 1));
if(visitors[j] != null) owner.announce(PacketCreator.getPlayerShopNewVisitor(visitors[j], j + 1));
}
this.broadcastRestoreToVisitors();
owner.getMap().broadcastMessage(MaplePacketCreator.updatePlayerShopBox(this));
owner.getMap().broadcastMessage(PacketCreator.updatePlayerShopBox(this));
return;
}
}
@@ -187,7 +187,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
visitorLock.unlock();
}
owner.getMap().broadcastMessage(MaplePacketCreator.updatePlayerShopBox(this));
owner.getMap().broadcastMessage(PacketCreator.updatePlayerShopBox(this));
}
}
@@ -226,8 +226,8 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
iitem.setQuantity((short) (shopItem.getItem().getQuantity() * shopItem.getBundles()));
if (!MapleInventory.checkSpot(chr, iitem)) {
chr.announce(MaplePacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item."));
chr.announce(MaplePacketCreator.enableActions());
chr.announce(PacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item."));
chr.announce(PacketCreator.enableActions());
return;
}
@@ -235,7 +235,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
}
removeFromSlot(slot);
chr.announce(MaplePacketCreator.getPlayerShopItemUpdate(this));
chr.announce(PacketCreator.getPlayerShopItemUpdate(this));
}
}
}
@@ -254,10 +254,10 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
newItem.setQuantity((short) ((pItem.getItem().getQuantity() * quantity)));
if (quantity < 1 || !pItem.isExist() || pItem.getBundles() < quantity) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
} else if (newItem.getInventoryType().equals(MapleInventoryType.EQUIP) && newItem.getQuantity() > 1) {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
@@ -270,7 +270,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
if (c.getPlayer().getMeso() >= price) {
if (!owner.canHoldMeso(price)) { // thanks Rohenn for noticing owner hold check misplaced
c.getPlayer().dropMessage(1, "Transaction failed since the shop owner can't hold any more mesos.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
@@ -280,7 +280,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
owner.gainMeso(price, true);
SoldItem soldItem = new SoldItem(c.getPlayer().getName(), pItem.getItem().getItemId(), quantity, price);
owner.announce(MaplePacketCreator.getPlayerShopOwnerUpdate(soldItem, item));
owner.announce(PacketCreator.getPlayerShopOwnerUpdate(soldItem, item));
synchronized (sold) {
sold.add(soldItem);
@@ -298,12 +298,12 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
}
} else {
c.getPlayer().dropMessage(1, "Your inventory is full. Please clear a slot before buying this item.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
} else {
c.getPlayer().dropMessage(1, "You don't have enough mesos to purchase this item.");
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
return false;
}
@@ -335,13 +335,13 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
try {
for (int i = 0; i < 3; i++) {
if (visitors[i] != null) {
visitors[i].getClient().announce(MaplePacketCreator.getPlayerShopRemoveVisitor(i + 1));
visitors[i].getClient().announce(PacketCreator.getPlayerShopRemoveVisitor(i + 1));
}
}
for (int i = 0; i < 3; i++) {
if (visitors[i] != null) {
visitors[i].getClient().announce(MaplePacketCreator.getPlayerShop(this, false));
visitors[i].getClient().announce(PacketCreator.getPlayerShop(this, false));
}
}
@@ -359,7 +359,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
try {
for (int i = 0; i < 3; i++) {
if (visitors[i] != null) {
visitors[i].getClient().announce(MaplePacketCreator.shopErrorMessage(10, 1));
visitors[i].getClient().announce(PacketCreator.shopErrorMessage(10, 1));
visitorList.add(visitors[i]);
}
}
@@ -418,7 +418,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
chatSlot.put(c.getPlayer().getId(), s);
}
broadcast(MaplePacketCreator.getPlayerShopChat(c.getPlayer(), chat, s));
broadcast(PacketCreator.getPlayerShopChat(c.getPlayer(), chat, s));
}
private void recoverChatLog() {
@@ -427,7 +427,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
MapleCharacter chr = it.getLeft();
Byte pos = chatSlot.get(chr.getId());
broadcastToVisitors(MaplePacketCreator.getPlayerShopChat(chr, it.getRight(), pos));
broadcastToVisitors(PacketCreator.getPlayerShopChat(chr, it.getRight(), pos));
}
}
}
@@ -441,13 +441,13 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
public void closeShop() {
clearChatLog();
removeVisitors();
owner.getMap().broadcastMessage(MaplePacketCreator.removePlayerShopBox(this));
owner.getMap().broadcastMessage(PacketCreator.removePlayerShopBox(this));
}
public void sendShop(MapleClient c) {
visitorLock.lock();
try {
c.announce(MaplePacketCreator.getPlayerShop(this, isOwner(c.getPlayer())));
c.announce(PacketCreator.getPlayerShop(this, isOwner(c.getPlayer())));
} finally {
visitorLock.unlock();
}
@@ -512,7 +512,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
}
if(target != null) {
target.getClient().announce(MaplePacketCreator.shopErrorMessage(5, 1));
target.getClient().announce(PacketCreator.shopErrorMessage(5, 1));
removeVisitor(target);
}
}
@@ -572,12 +572,12 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
@Override
public void sendDestroyData(MapleClient client) {
client.announce(MaplePacketCreator.removePlayerShopBox(this));
client.announce(PacketCreator.removePlayerShopBox(this));
}
@Override
public void sendSpawnData(MapleClient client) {
client.announce(MaplePacketCreator.updatePlayerShopBox(this));
client.announce(PacketCreator.updatePlayerShopBox(this));
}
@Override

20
src/main/java/server/maps/MapleReactor.java
View File

@@ -30,7 +30,7 @@ import net.server.services.type.ChannelServices;
import scripting.reactor.ReactorScriptManager;
import server.TimerManager;
import server.partyquest.GuardianSpawnPoint;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.awt.*;
@@ -170,7 +170,7 @@ public class MapleReactor extends AbstractMapleMapObject {
}
public final byte[] makeDestroyData() {
return MaplePacketCreator.destroyReactor(this);
return PacketCreator.destroyReactor(this);
}
@Override
@@ -181,7 +181,7 @@ public class MapleReactor extends AbstractMapleMapObject {
}
public final byte[] makeSpawnData() {
return MaplePacketCreator.spawnReactor(this);
return PacketCreator.spawnReactor(this);
}
public void resetReactorActions(int newState) {
@@ -199,7 +199,7 @@ public class MapleReactor extends AbstractMapleMapObject {
this.lockReactor();
try {
this.resetReactorActions(newState);
map.broadcastMessage(MaplePacketCreator.triggerReactor(this, (short) 0));
map.broadcastMessage(PacketCreator.triggerReactor(this, (short) 0));
} finally {
this.unlockReactor();
}
@@ -212,7 +212,7 @@ public class MapleReactor extends AbstractMapleMapObject {
try {
this.resetReactorActions(newState);
map.broadcastMessage(MaplePacketCreator.triggerReactor(this, (short) 0));
map.broadcastMessage(PacketCreator.triggerReactor(this, (short) 0));
} finally {
reactorLock.unlock();
}
@@ -278,15 +278,15 @@ public class MapleReactor extends AbstractMapleMapObject {
if (delay > 0) {
map.destroyReactor(getObjectId());
} else {//trigger as normal
map.broadcastMessage(MaplePacketCreator.triggerReactor(this, stance));
map.broadcastMessage(PacketCreator.triggerReactor(this, stance));
}
} else {//item-triggered on final step
map.broadcastMessage(MaplePacketCreator.triggerReactor(this, stance));
map.broadcastMessage(PacketCreator.triggerReactor(this, stance));
}
ReactorScriptManager.getInstance().act(c, this);
} else { //reactor not broken yet
map.broadcastMessage(MaplePacketCreator.triggerReactor(this, stance));
map.broadcastMessage(PacketCreator.triggerReactor(this, stance));
if (state == stats.getNextState(state, b)) {//current state = next state, looping reactor
ReactorScriptManager.getInstance().act(c, this);
}
@@ -302,7 +302,7 @@ public class MapleReactor extends AbstractMapleMapObject {
}
} else {
state++;
map.broadcastMessage(MaplePacketCreator.triggerReactor(this, stance));
map.broadcastMessage(PacketCreator.triggerReactor(this, stance));
if (this.getId() != 9980000 && this.getId() != 9980001) {
ReactorScriptManager.getInstance().act(c, this);
}
@@ -344,7 +344,7 @@ public class MapleReactor extends AbstractMapleMapObject {
}
}
map.broadcastMessage(MaplePacketCreator.destroyReactor(this));
map.broadcastMessage(PacketCreator.destroyReactor(this));
return false;
}

9
src/main/java/server/maps/MapleSummon.java
View File

@@ -21,11 +21,12 @@
*/
package server.maps;
import java.awt.Point;
import client.MapleCharacter;
import client.MapleClient;
import client.SkillFactory;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.awt.*;
/**
*
@@ -49,12 +50,12 @@ public class MapleSummon extends AbstractAnimatedMapleMapObject {
@Override
public void sendSpawnData(MapleClient client) {
client.announce(MaplePacketCreator.spawnSummon(this, false));
client.announce(PacketCreator.spawnSummon(this, false));
}
@Override
public void sendDestroyData(MapleClient client) {
client.announce(MaplePacketCreator.removeSummon(this, true));
client.announce(PacketCreator.removeSummon(this, true));
}
public MapleCharacter getOwner() {

8
src/main/java/server/maps/MapleTVEffect.java
View File

@@ -24,7 +24,7 @@ package server.maps;
import client.MapleCharacter;
import net.server.Server;
import server.TimerManager;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.List;
@@ -51,8 +51,8 @@ public class MapleTVEffect {
Server server = Server.getInstance();
ACTIVE[userWorld] = activity;
if (activity) {
server.broadcastMessage(userWorld, MaplePacketCreator.enableTV());
server.broadcastMessage(userWorld, MaplePacketCreator.sendTV(user, message, type <= 2 ? type : type - 3, partner));
server.broadcastMessage(userWorld, PacketCreator.enableTV());
server.broadcastMessage(userWorld, PacketCreator.sendTV(user, message, type <= 2 ? type : type - 3, partner));
int delay = 15000;
if (type == 4) {
delay = 30000;
@@ -61,7 +61,7 @@ public class MapleTVEffect {
}
TimerManager.getInstance().schedule(() -> broadcastTV(false, userWorld, null, null, -1, null), delay);
} else {
server.broadcastMessage(userWorld, MaplePacketCreator.removeTV());
server.broadcastMessage(userWorld, PacketCreator.removeTV());
}
}
}

16
src/main/java/server/minigame/MapleRockPaperScissor.java
View File

@@ -3,7 +3,7 @@ package server.minigame;
import client.MapleClient;
import client.inventory.Item;
import client.inventory.manipulator.MapleInventoryManipulator;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Randomizer;
/**
@@ -18,7 +18,7 @@ public class MapleRockPaperScissor{
private boolean win = false;
public MapleRockPaperScissor(final MapleClient c, final byte mode){
c.announce(MaplePacketCreator.rpsMode((byte) (9 + mode)));
c.announce(PacketCreator.rpsMode((byte) (9 + mode)));
if(mode == 0){
c.getPlayer().gainMeso(-1000, true, true, true);
}
@@ -28,14 +28,14 @@ public class MapleRockPaperScissor{
if(ableAnswer && !win && answer >= 0 && answer <= 2){
final int response = Randomizer.nextInt(3);
if(response == answer){
c.announce(MaplePacketCreator.rpsSelection((byte) response, (byte) round));
c.announce(PacketCreator.rpsSelection((byte) response, (byte) round));
// dont do anything. they can still answer once a draw
}else if((answer == 0 && response == 2) || (answer == 1 && response == 0) || (answer == 2 && response == 1)){ // they win
c.announce(MaplePacketCreator.rpsSelection((byte) response, (byte) (round + 1)));
c.announce(PacketCreator.rpsSelection((byte) response, (byte) (round + 1)));
ableAnswer = false;
win = true;
}else{ // they lose
c.announce(MaplePacketCreator.rpsSelection((byte) response, (byte) -1));
c.announce(PacketCreator.rpsSelection((byte) response, (byte) -1));
ableAnswer = false;
}
return true;
@@ -47,7 +47,7 @@ public class MapleRockPaperScissor{
public final boolean timeOut(final MapleClient c){
if(ableAnswer && !win){
ableAnswer = false;
c.announce(MaplePacketCreator.rpsMode((byte) 0x0A));
c.announce(PacketCreator.rpsMode((byte) 0x0A));
return true;
}
reward(c);
@@ -60,7 +60,7 @@ public class MapleRockPaperScissor{
if(round < 10){
win = false;
ableAnswer = true;
c.announce(MaplePacketCreator.rpsMode((byte) 0x0C));
c.announce(PacketCreator.rpsMode((byte) 0x0C));
return true;
} else {
round = 10;
@@ -79,6 +79,6 @@ public class MapleRockPaperScissor{
public final void dispose(final MapleClient c){
reward(c);
c.announce(MaplePacketCreator.rpsMode((byte) 0x0D));
c.announce(PacketCreator.rpsMode((byte) 0x0D));
}
}

8
src/main/java/server/partyquest/AriantColiseum.java
View File

@@ -25,7 +25,7 @@ import server.TimerManager;
import server.expeditions.MapleExpedition;
import server.expeditions.MapleExpeditionType;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.ArrayList;
import java.util.HashMap;
@@ -76,7 +76,7 @@ public class AriantColiseum {
}
for (MapleCharacter mc : players) {
mc.announce(MaplePacketCreator.updateAriantPQRanking(score));
mc.announce(PacketCreator.updateAriantPQRanking(score));
}
setAriantScoreBoard(TimerManager.getInstance().schedule(() -> showArenaResults(), pqTimerBoard));
@@ -144,7 +144,7 @@ public class AriantColiseum {
private void broadcastAriantScoreUpdate() {
if (scoreDirty) {
for (MapleCharacter chr : score.keySet()) {
chr.announce(MaplePacketCreator.updateAriantPQRanking(score));
chr.announce(PacketCreator.updateAriantPQRanking(score));
}
scoreDirty = false;
}
@@ -193,7 +193,7 @@ public class AriantColiseum {
eventClear = true;
if (map != null) {
map.broadcastMessage(MaplePacketCreator.showAriantScoreBoard());
map.broadcastMessage(PacketCreator.showAriantScoreBoard());
map.killAllMonsters();
distributeAriantPoints();

20
src/main/java/server/partyquest/MonsterCarnival.java
View File

@@ -10,7 +10,7 @@ import net.server.world.MaplePartyCharacter;
import server.TimerManager;
import server.maps.MapleMap;
import server.maps.MapleReactor;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.concurrent.ScheduledFuture;
@@ -346,7 +346,7 @@ public class MonsterCarnival {
}
startTime = System.currentTimeMillis() + 3 * 60 * 1000;
map.broadcastMessage(MaplePacketCreator.getClock(3 * 60));
map.broadcastMessage(PacketCreator.getClock(3 * 60));
timer = TimerManager.getInstance().schedule(() -> timeUp(), map.getTimeExpand() * 1000);
effectTimer = TimerManager.getInstance().schedule(() -> complete(), map.getTimeExpand() * 1000 - 10 * 1000); // thanks Vcoc for noticing a time set issue here
@@ -374,12 +374,12 @@ public class MonsterCarnival {
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
if (redWin) {
mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/win"));
mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Win"));
mc.getClient().announce(PacketCreator.showEffect("quest/carnival/win"));
mc.getClient().announce(PacketCreator.playSound("MobCarnival/Win"));
mc.dispelDebuffs();
} else {
mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/lose"));
mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Lose"));
mc.getClient().announce(PacketCreator.showEffect("quest/carnival/lose"));
mc.getClient().announce(PacketCreator.playSound("MobCarnival/Lose"));
mc.dispelDebuffs();
}
}
@@ -388,12 +388,12 @@ public class MonsterCarnival {
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
if (!redWin) {
mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/win"));
mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Win"));
mc.getClient().announce(PacketCreator.showEffect("quest/carnival/win"));
mc.getClient().announce(PacketCreator.playSound("MobCarnival/Win"));
mc.dispelDebuffs();
} else {
mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/lose"));
mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Lose"));
mc.getClient().announce(PacketCreator.showEffect("quest/carnival/lose"));
mc.getClient().announce(PacketCreator.playSound("MobCarnival/Lose"));
mc.dispelDebuffs();
}
}

7
src/main/java/server/partyquest/MonsterCarnivalParty.java
View File

@@ -1,10 +1,11 @@
package server.partyquest;
import client.MapleCharacter;
import server.maps.MapleMap;
import tools.PacketCreator;
import java.util.LinkedList;
import java.util.List;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
/**
* @author Rob
@@ -111,7 +112,7 @@ public class MonsterCarnivalParty {
final String effect = winner ? "quest/carnival/win" : "quest/carnival/lose";
for (final MapleCharacter chr : members) {
chr.announce(MaplePacketCreator.showEffect(effect));
chr.announce(PacketCreator.showEffect(effect));
}
}

14
src/main/java/server/partyquest/Pyramid.java
View File

@@ -26,7 +26,7 @@ import client.MapleCharacter;
import net.server.world.MapleParty;
import server.MapleItemInformationProvider;
import server.TimerManager;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.concurrent.ScheduledFuture;
@@ -151,8 +151,8 @@ public class Pyramid extends PartyQuest {
public void broadcastInfo(String info, int amount) {
for (MapleCharacter chr : getParticipants()) {
chr.announce(MaplePacketCreator.getEnergy("massacre_" + info, amount));
chr.announce(MaplePacketCreator.pyramidGauge(count));
chr.announce(PacketCreator.getEnergy("massacre_" + info, amount));
chr.announce(PacketCreator.pyramidGauge(count));
}
}
@@ -177,7 +177,7 @@ public class Pyramid extends PartyQuest {
skill++;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for (MapleCharacter chr : getParticipants()) {
chr.announce(MaplePacketCreator.getEnergy("massacre_skill", skill));
chr.announce(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022586).applyTo(chr);
}
} else if (buffcount == 2 && total >= 1000) {
@@ -185,7 +185,7 @@ public class Pyramid extends PartyQuest {
skill++;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for (MapleCharacter chr : getParticipants()) {
chr.announce(MaplePacketCreator.getEnergy("massacre_skill", skill));
chr.announce(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022587).applyTo(chr);
}
} else if (buffcount == 3 && total >= 1500) {
@@ -196,7 +196,7 @@ public class Pyramid extends PartyQuest {
skill++;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for (MapleCharacter chr : getParticipants()) {
chr.announce(MaplePacketCreator.getEnergy("massacre_skill", skill));
chr.announce(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022588).applyTo(chr);
}
} else if (buffcount == 5 && total >= 2500) {
@@ -229,7 +229,7 @@ public class Pyramid extends PartyQuest {
exp += ((kill * 2) + (cool * 10));
}
chr.announce(MaplePacketCreator.pyramidScore(rank, exp));
chr.announce(PacketCreator.pyramidScore(rank, exp));
chr.gainExp(exp, true, true);
}
}

10
src/main/java/server/quest/MapleQuest.java
View File

@@ -32,7 +32,7 @@ import provider.MapleDataTool;
import provider.wz.WZFiles;
import server.quest.actions.*;
import server.quest.requirements.*;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.StringUtil;
import java.util.*;
@@ -315,7 +315,7 @@ public class MapleQuest {
return false;
}
if (timeLimit > 0) {
chr.announce(MaplePacketCreator.removeQuestTimeLimit(id));
chr.announce(PacketCreator.removeQuestTimeLimit(id));
}
MapleQuestStatus newStatus = new MapleQuestStatus(this, MapleQuestStatus.Status.NOT_STARTED);
newStatus.setForfeited(chr.getQuest(this).getForfeited() + 1);
@@ -361,7 +361,7 @@ public class MapleQuest {
public boolean forceComplete(MapleCharacter chr, int npc) {
if (timeLimit > 0) {
chr.announce(MaplePacketCreator.removeQuestTimeLimit(id));
chr.announce(PacketCreator.removeQuestTimeLimit(id));
}
MapleQuestStatus newStatus = new MapleQuestStatus(this, MapleQuestStatus.Status.COMPLETED, npc);
@@ -370,8 +370,8 @@ public class MapleQuest {
newStatus.setCompletionTime(System.currentTimeMillis());
chr.updateQuestStatus(newStatus);
chr.announce(MaplePacketCreator.showSpecialEffect(9)); // Quest completion
chr.getMap().broadcastMessage(chr, MaplePacketCreator.showForeignEffect(chr.getId(), 9), false); //use 9 instead of 12 for both
chr.announce(PacketCreator.showSpecialEffect(9)); // Quest completion
chr.getMap().broadcastMessage(chr, PacketCreator.showForeignEffect(chr.getId(), 9), false); //use 9 instead of 12 for both
return true;
}

6
src/main/java/server/quest/actions/ItemAction.java
View File

@@ -33,7 +33,7 @@ import server.MapleItemInformationProvider;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.Randomizer;
@@ -143,14 +143,14 @@ public class ItemAction extends MapleQuestAction {
}
MapleInventoryManipulator.removeById(chr.getClient(), type, itemid, quantity, true, false);
chr.announce(MaplePacketCreator.getShowItemGain(itemid, (short) count, true));
chr.announce(PacketCreator.getShowItemGain(itemid, (short) count, true));
}
for(ItemData iEntry: giveItem) {
int itemid = iEntry.getId(), count = iEntry.getCount(), period = iEntry.getPeriod(); // thanks Vcoc for noticing quest milestone item not getting removed from inventory after a while
MapleInventoryManipulator.addById(chr.getClient(), itemid, (short) count, "", -1, period > 0 ? (System.currentTimeMillis() + period * 60 * 1000) : -1);
chr.announce(MaplePacketCreator.getShowItemGain(itemid, (short) count, true));
chr.announce(PacketCreator.getShowItemGain(itemid, (short) count, true));
}
}

4
src/main/java/server/quest/actions/NextQuestAction.java
View File

@@ -27,7 +27,7 @@ import provider.MapleData;
import provider.MapleDataTool;
import server.quest.MapleQuest;
import server.quest.MapleQuestActionType;
import tools.MaplePacketCreator;
import tools.PacketCreator;
/**
*
@@ -50,6 +50,6 @@ public class NextQuestAction extends MapleQuestAction {
@Override
public void run(MapleCharacter chr, Integer extSelection) {
MapleQuestStatus status = chr.getQuest(MapleQuest.getInstance(questID));
chr.announce(MaplePacketCreator.updateQuestFinish((short) questID, status.getNpc(), (short) nextQuest));
chr.announce(PacketCreator.updateQuestFinish((short) questID, status.getNpc(), (short) nextQuest));
}
}