Remove "Maple" prefix from MaplePacketCreator name
This commit is contained in:
@@ -23,15 +23,15 @@ package net.server.channel.handlers;
|
||||
|
||||
import client.MapleCharacter;
|
||||
import client.MapleClient;
|
||||
import client.inventory.MapleInventoryType;
|
||||
import client.autoban.AutobanManager;
|
||||
import client.inventory.MapleInventoryType;
|
||||
import client.inventory.manipulator.MapleInventoryManipulator;
|
||||
import constants.inventory.ItemConstants;
|
||||
import net.AbstractMaplePacketHandler;
|
||||
import net.server.Server;
|
||||
import client.inventory.manipulator.MapleInventoryManipulator;
|
||||
import server.MapleItemInformationProvider;
|
||||
import server.life.MapleMonster;
|
||||
import tools.MaplePacketCreator;
|
||||
import tools.PacketCreator;
|
||||
import tools.data.input.SeekableLittleEndianAccessor;
|
||||
|
||||
/**
|
||||
@@ -59,27 +59,27 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler {
|
||||
switch (itemId) {
|
||||
case 2270000:
|
||||
if (mob.getId() == 9300101) {
|
||||
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
mob.getMap().killMonster(mob, null, false);
|
||||
MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true);
|
||||
MapleInventoryManipulator.addById(c, 1902000, (short) 1, "", -1);
|
||||
}
|
||||
c.announce(MaplePacketCreator.enableActions());
|
||||
c.announce(PacketCreator.enableActions());
|
||||
break;
|
||||
case 2270001:
|
||||
if (mob.getId() == 9500197) {
|
||||
if ((abm.getLastSpam(10) + 1000) < currentServerTime()) {
|
||||
if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
|
||||
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
mob.getMap().killMonster(mob, null, false);
|
||||
MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true);
|
||||
MapleInventoryManipulator.addById(c, 4031830, (short) 1, "", -1);
|
||||
} else {
|
||||
abm.spam(10);
|
||||
c.announce(MaplePacketCreator.catchMessage(0));
|
||||
c.announce(PacketCreator.catchMessage(0));
|
||||
}
|
||||
}
|
||||
c.announce(MaplePacketCreator.enableActions());
|
||||
c.announce(PacketCreator.enableActions());
|
||||
}
|
||||
break;
|
||||
case 2270002:
|
||||
@@ -88,12 +88,12 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler {
|
||||
if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
|
||||
if (chr.canHold(4031868, 1)) {
|
||||
if (Math.random() < 0.5) { // 50% chance
|
||||
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
mob.getMap().killMonster(mob, null, false);
|
||||
MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true);
|
||||
MapleInventoryManipulator.addById(c, 4031868, (short) 1, "", -1);
|
||||
} else {
|
||||
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 0));
|
||||
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 0));
|
||||
}
|
||||
} else {
|
||||
chr.dropMessage(5, "Make a ETC slot available before using this item.");
|
||||
@@ -101,89 +101,89 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler {
|
||||
|
||||
abm.spam(10);
|
||||
} else {
|
||||
c.announce(MaplePacketCreator.catchMessage(0));
|
||||
c.announce(PacketCreator.catchMessage(0));
|
||||
}
|
||||
}
|
||||
c.announce(MaplePacketCreator.enableActions());
|
||||
c.announce(PacketCreator.enableActions());
|
||||
}
|
||||
break;
|
||||
case 2270003:
|
||||
if (mob.getId() == 9500320) {
|
||||
if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
|
||||
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
mob.getMap().killMonster(mob, null, false);
|
||||
MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true);
|
||||
MapleInventoryManipulator.addById(c, 4031887, (short) 1, "", -1);
|
||||
} else {
|
||||
c.announce(MaplePacketCreator.catchMessage(0));
|
||||
c.announce(PacketCreator.catchMessage(0));
|
||||
}
|
||||
}
|
||||
c.announce(MaplePacketCreator.enableActions());
|
||||
c.announce(PacketCreator.enableActions());
|
||||
break;
|
||||
case 2270005:
|
||||
if (mob.getId() == 9300187) {
|
||||
if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) {
|
||||
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
mob.getMap().killMonster(mob, null, false);
|
||||
MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true);
|
||||
MapleInventoryManipulator.addById(c, 2109001, (short) 1, "", -1);
|
||||
} else {
|
||||
c.announce(MaplePacketCreator.catchMessage(0));
|
||||
c.announce(PacketCreator.catchMessage(0));
|
||||
}
|
||||
}
|
||||
c.announce(MaplePacketCreator.enableActions());
|
||||
c.announce(PacketCreator.enableActions());
|
||||
break;
|
||||
case 2270006:
|
||||
if (mob.getId() == 9300189) {
|
||||
if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) {
|
||||
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
mob.getMap().killMonster(mob, null, false);
|
||||
MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true);
|
||||
MapleInventoryManipulator.addById(c, 2109002, (short) 1, "", -1);
|
||||
} else {
|
||||
c.announce(MaplePacketCreator.catchMessage(0));
|
||||
c.announce(PacketCreator.catchMessage(0));
|
||||
}
|
||||
}
|
||||
c.announce(MaplePacketCreator.enableActions());
|
||||
c.announce(PacketCreator.enableActions());
|
||||
break;
|
||||
case 2270007:
|
||||
if (mob.getId() == 9300191) {
|
||||
if (mob.getHp() < ((mob.getMaxHp() / 10) * 3)) {
|
||||
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
mob.getMap().killMonster(mob, null, false);
|
||||
MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true);
|
||||
MapleInventoryManipulator.addById(c, 2109003, (short) 1, "", -1);
|
||||
} else {
|
||||
c.announce(MaplePacketCreator.catchMessage(0));
|
||||
c.announce(PacketCreator.catchMessage(0));
|
||||
}
|
||||
}
|
||||
c.announce(MaplePacketCreator.enableActions());
|
||||
c.announce(PacketCreator.enableActions());
|
||||
break;
|
||||
case 2270004:
|
||||
if (mob.getId() == 9300175) {
|
||||
if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
|
||||
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
mob.getMap().killMonster(mob, null, false);
|
||||
MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true);
|
||||
MapleInventoryManipulator.addById(c, 4001169, (short) 1, "", -1);
|
||||
} else {
|
||||
c.announce(MaplePacketCreator.catchMessage(0));
|
||||
c.announce(PacketCreator.catchMessage(0));
|
||||
}
|
||||
}
|
||||
c.announce(MaplePacketCreator.enableActions());
|
||||
c.announce(PacketCreator.enableActions());
|
||||
break;
|
||||
case 2270008:
|
||||
if (mob.getId() == 9500336) {
|
||||
if ((abm.getLastSpam(10) + 3000) < currentServerTime()) {
|
||||
abm.spam(10);
|
||||
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
mob.getMap().killMonster(mob, null, false);
|
||||
MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true);
|
||||
MapleInventoryManipulator.addById(c, 2022323, (short) 1, "", -1);
|
||||
} else {
|
||||
chr.message("You cannot use the Fishing Net yet.");
|
||||
}
|
||||
c.announce(MaplePacketCreator.enableActions());
|
||||
c.announce(PacketCreator.enableActions());
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@@ -199,21 +199,21 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler {
|
||||
|
||||
if (timeCatch != 0 && (abm.getLastSpam(10) + timeCatch) < currentServerTime()) {
|
||||
if (mobHp != 0 && mob.getHp() < ((mob.getMaxHp() / 100) * mobHp)) {
|
||||
chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
chr.getMap().broadcastMessage(PacketCreator.catchMonster(monsterid, itemId, (byte) 1));
|
||||
mob.getMap().killMonster(mob, null, false);
|
||||
MapleInventoryManipulator.removeById(c, MapleInventoryType.USE, itemId, 1, true, true);
|
||||
MapleInventoryManipulator.addById(c, itemGanho, (short) 1, "", -1);
|
||||
} else if (mob.getId() != 9500336) {
|
||||
if (mobHp != 0) {
|
||||
abm.spam(10);
|
||||
c.announce(MaplePacketCreator.catchMessage(0));
|
||||
c.announce(PacketCreator.catchMessage(0));
|
||||
}
|
||||
} else {
|
||||
chr.message("You cannot use the Fishing Net yet.");
|
||||
}
|
||||
}
|
||||
}
|
||||
c.announce(MaplePacketCreator.enableActions());
|
||||
c.announce(PacketCreator.enableActions());
|
||||
|
||||
// System.out.println("UseCatchItemHandler: \r\n" + slea.toString());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user