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

Merge pull request #89 from truongdatnhan/master

Browse Source 
Fixing bugs, Clean up code, Upgrade to new Syntax
This commit is contained in:
Ponk
2022-08-11 11:16:15 +02:00
committed by GitHub
parent 1c0aebf6aa 7f7b28874f
commit 381851e95e
45 changed files with 673 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/client/Character.java
View File

@@ -7406,6 +7406,14 @@ public class Character extends AbstractCharacterObject {
ret.buddylist.loadFromDb(charid); ret.buddylist.loadFromDb(charid);
ret.storage = wserv.getAccountStorage(ret.accountid); ret.storage = wserv.getAccountStorage(ret.accountid);
/* Double-check storage incase player is first time on server
* The storage won't exist so nothing to load
*/
if(ret.storage == null) {
wserv.loadAccountStorage(ret.accountid);
ret.storage = wserv.getAccountStorage(ret.accountid);
}
int startHp = ret.hp, startMp = ret.mp; int startHp = ret.hp, startMp = ret.mp;
ret.reapplyLocalStats(); ret.reapplyLocalStats();
ret.changeHpMp(startHp, startMp, true); ret.changeHpMp(startHp, startMp, true);

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

@@ -174,8 +174,8 @@ public class Ring implements Comparable<Ring> {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (o instanceof Ring) { if (o instanceof Ring ring) {
return ((Ring) o).getRingId() == getRingId(); return ring.getRingId() == getRingId();
} }
return false; return false;
} }

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

@@ -8,8 +8,9 @@ import server.ThreadManager;
import tools.exceptions.IdTypeNotSupportedException; import tools.exceptions.IdTypeNotSupportedException;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -75,7 +76,7 @@ public class IdCommand extends Command {
throw new IdTypeNotSupportedException(); throw new IdTypeNotSupportedException();
} }
itemMap.put(type, new HashMap<>()); itemMap.put(type, new HashMap<>());
BufferedReader reader = new BufferedReader(new FileReader(handbookDirectory.get(type))); try (BufferedReader reader = Files.newBufferedReader(Paths.get(handbookDirectory.get(type)))) {
String line; String line;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
String[] row = line.split(" - ", 2); String[] row = line.split(" - ", 2);
@@ -84,6 +85,7 @@ public class IdCommand extends Command {
} }
} }
} }
}
private String joinStringArr(String[] arr, String separator) { private String joinStringArr(String[] arr, String separator) {
if (null == arr || 0 == arr.length) { if (null == arr || 0 == arr.length) {

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

@@ -48,19 +48,15 @@ public class WhereaMiCommand extends Command {
HashSet<Monster> mobs = new HashSet<>(); HashSet<Monster> mobs = new HashSet<>();
for (MapObject mmo : player.getMap().getMapObjects()) { for (MapObject mmo : player.getMap().getMapObjects()) {
if (mmo instanceof NPC) { if (mmo instanceof NPC npc) {
NPC npc = (NPC) mmo;
npcs.add(npc); npcs.add(npc);
} else if (mmo instanceof Character) { } else if (mmo instanceof Character mc) {
Character mc = (Character) mmo;
chars.add(mc); chars.add(mc);
} else if (mmo instanceof Monster) { } else if (mmo instanceof Monster mob) {
Monster mob = (Monster) mmo;
if (mob.isAlive()) { if (mob.isAlive()) {
mobs.add(mob); mobs.add(mob);
} }
} else if (mmo instanceof PlayerNPC) { } else if (mmo instanceof PlayerNPC npc) {
PlayerNPC npc = (PlayerNPC) mmo;
playernpcs.add(npc); playernpcs.add(npc);
} }
} }

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

@@ -61,7 +61,7 @@ public class FaceCommand extends Command {
} }
Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]); Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim == null) { if (victim != null) {
victim.setFace(itemId); victim.setFace(itemId);
victim.updateSingleStat(Stat.FACE, itemId); victim.updateSingleStat(Stat.FACE, itemId);
victim.equipChanged(); victim.equipChanged();

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

@@ -35,9 +35,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import tools.HexTool; import tools.HexTool;
import java.io.FileReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Properties; import java.util.Properties;
public class PeCommand extends Command { public class PeCommand extends Command {
@@ -51,11 +52,9 @@ public class PeCommand extends Command {
public void execute(Client c, String[] params) { public void execute(Client c, String[] params) {
Character player = c.getPlayer(); Character player = c.getPlayer();
String packet = ""; String packet = "";
try { try (BufferedReader br = Files.newBufferedReader(Paths.get("pe.txt"))) {
InputStreamReader is = new FileReader("pe.txt");
Properties packetProps = new Properties(); Properties packetProps = new Properties();
packetProps.load(is); packetProps.load(br);
is.close();
packet = packetProps.getProperty("pe"); packet = packetProps.getProperty("pe");
} catch (IOException ex) { } catch (IOException ex) {
ex.printStackTrace(); ex.printStackTrace();

17
src/main/java/client/inventory/manipulator/InventoryManipulator.java
View File

@@ -538,7 +538,8 @@ public class InventoryManipulator {
itemChanged = true; itemChanged = true;
} }
if (dst == -6) { // unequip the overall switch (dst) {
case -6: // unequip the overall
Item top = eqpdInv.getItem((short) -5); Item top = eqpdInv.getItem((short) -5);
if (top != null && ItemConstants.isOverall(top.getItemId())) { if (top != null && ItemConstants.isOverall(top.getItemId())) {
if (eqpInv.isFull()) { if (eqpInv.isFull()) {
@@ -548,7 +549,8 @@ public class InventoryManipulator {
} }
unequip(c, (byte) -5, eqpInv.getNextFreeSlot()); unequip(c, (byte) -5, eqpInv.getNextFreeSlot());
} }
} else if (dst == -5) { break;
case -5:
final Item bottom = eqpdInv.getItem((short) -6); final Item bottom = eqpdInv.getItem((short) -6);
if (bottom != null && ItemConstants.isOverall(source.getItemId())) { if (bottom != null && ItemConstants.isOverall(source.getItemId())) {
if (eqpInv.isFull()) { if (eqpInv.isFull()) {
@@ -558,7 +560,8 @@ public class InventoryManipulator {
} }
unequip(c, (byte) -6, eqpInv.getNextFreeSlot()); unequip(c, (byte) -6, eqpInv.getNextFreeSlot());
} }
} else if (dst == -10) {// check if weapon is two-handed break;
case -10: // check if weapon is two-handed
Item weapon = eqpdInv.getItem((short) -11); Item weapon = eqpdInv.getItem((short) -11);
if (weapon != null && ii.isTwoHanded(weapon.getItemId())) { if (weapon != null && ii.isTwoHanded(weapon.getItemId())) {
if (eqpInv.isFull()) { if (eqpInv.isFull()) {
@@ -568,7 +571,8 @@ public class InventoryManipulator {
} }
unequip(c, (byte) -11, eqpInv.getNextFreeSlot()); unequip(c, (byte) -11, eqpInv.getNextFreeSlot());
} }
} else if (dst == -11) { break;
case -11:
Item shield = eqpdInv.getItem((short) -10); Item shield = eqpdInv.getItem((short) -10);
if (shield != null && ii.isTwoHanded(source.getItemId())) { if (shield != null && ii.isTwoHanded(source.getItemId())) {
if (eqpInv.isFull()) { if (eqpInv.isFull()) {
@@ -578,11 +582,12 @@ public class InventoryManipulator {
} }
unequip(c, (byte) -10, eqpInv.getNextFreeSlot()); unequip(c, (byte) -10, eqpInv.getNextFreeSlot());
} }
} break;
if (dst == -18) { case -18:
if (chr.getMount() != null) { if (chr.getMount() != null) {
chr.getMount().setItemId(source.getItemId()); chr.getMount().setItemId(source.getItemId());
} }
break;
} }
//1112413, 1112414, 1112405 (Lilin's Ring) //1112413, 1112414, 1112405 (Lilin's Ring)

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

@@ -60,7 +60,8 @@ public class StorageProcessor {
if (c.tryacquireClient()) { if (c.tryacquireClient()) {
try { try {
if (mode == 4) { // take out switch (mode) {
case 4: { // take out
byte type = p.readByte(); byte type = p.readByte();
byte slot = p.readByte(); byte slot = p.readByte();
if (slot < 0 || slot > storage.getSlots()) { // removal starts at zero if (slot < 0 || slot > storage.getSlots()) { // removal starts at zero
@@ -104,14 +105,17 @@ public class StorageProcessor {
c.sendPacket(PacketCreator.getStorageError((byte) 0x0A)); c.sendPacket(PacketCreator.getStorageError((byte) 0x0A));
} }
} }
} else if (mode == 5) { // store break;
}
case 5: { // store
short slot = p.readShort(); short slot = p.readShort();
int itemId = p.readInt(); int itemId = p.readInt();
short quantity = p.readShort(); short quantity = p.readShort();
InventoryType invType = ItemConstants.getInventoryType(itemId); InventoryType invType = ItemConstants.getInventoryType(itemId);
Inventory inv = chr.getInventory(invType); Inventory inv = chr.getInventory(invType);
if (slot < 1 || slot > inv.getSlotLimit()) { // player inv starts at one if (slot < 1 || slot > inv.getSlotLimit()) { // player inv starts at one
AutobanFactory.PACKET_EDIT.alert(c.getPlayer(), c.getPlayer().getName() + " tried to packet edit with storage."); AutobanFactory.PACKET_EDIT.alert(c.getPlayer(),
c.getPlayer().getName() + " tried to packet edit with storage.");
log.warn("Chr {} tried to store item at slot {}", c.getPlayer().getName(), slot); log.warn("Chr {} tried to store item at slot {}", c.getPlayer().getName(), slot);
c.disconnect(true, false); c.disconnect(true, false);
return; return;
@@ -124,7 +128,6 @@ public class StorageProcessor {
c.sendPacket(PacketCreator.getStorageError((byte) 0x11)); c.sendPacket(PacketCreator.getStorageError((byte) 0x11));
return; return;
} }
int storeFee = storage.getStoreFee(); int storeFee = storage.getStoreFee();
if (chr.getMeso() < storeFee) { if (chr.getMeso() < storeFee) {
c.sendPacket(PacketCreator.getStorageError((byte) 0x0B)); c.sendPacket(PacketCreator.getStorageError((byte) 0x0B));
@@ -134,7 +137,8 @@ public class StorageProcessor {
inv.lockInventory(); // thanks imbee for pointing a dupe within storage inv.lockInventory(); // thanks imbee for pointing a dupe within storage
try { try {
item = inv.getItem(slot); item = inv.getItem(slot);
if (item != null && item.getItemId() == itemId && (item.getQuantity() >= quantity || ItemConstants.isRechargeable(itemId))) { if (item != null && item.getItemId() == itemId
&& (item.getQuantity() >= quantity || ItemConstants.isRechargeable(itemId))) {
if (ItemId.isWeddingRing(itemId) || ItemId.isWeddingToken(itemId)) { if (ItemId.isWeddingRing(itemId) || ItemId.isWeddingToken(itemId)) {
c.sendPacket(PacketCreator.enableActions()); c.sendPacket(PacketCreator.enableActions());
return; return;
@@ -167,12 +171,15 @@ public class StorageProcessor {
log.debug("Chr {} stored {}x {} ({})", c.getPlayer().getName(), item.getQuantity(), itemName, item.getItemId()); log.debug("Chr {} stored {}x {} ({})", c.getPlayer().getName(), item.getQuantity(), itemName, item.getItemId());
storage.sendStored(c, ItemConstants.getInventoryType(itemId)); storage.sendStored(c, ItemConstants.getInventoryType(itemId));
} }
} else if (mode == 6) { // arrange items break;
}
case 6: // arrange items
if (YamlConfig.config.server.USE_STORAGE_ITEM_SORT) { if (YamlConfig.config.server.USE_STORAGE_ITEM_SORT) {
storage.arrangeItems(c); storage.arrangeItems(c);
} }
c.sendPacket(PacketCreator.enableActions()); c.sendPacket(PacketCreator.enableActions());
} else if (mode == 7) { // meso break;
case 7: { // meso
int meso = p.readInt(); int meso = p.readInt();
int storageMesos = storage.getMeso(); int storageMesos = storage.getMeso();
int playerMesos = chr.getMeso(); int playerMesos = chr.getMeso();
@@ -199,8 +206,11 @@ public class StorageProcessor {
c.sendPacket(PacketCreator.enableActions()); c.sendPacket(PacketCreator.enableActions());
return; return;
} }
} else if (mode == 8) {// close... unless the player decides to enter cash shop! break;
}
case 8: // close... unless the player decides to enter cash shop!
storage.close(); storage.close();
break;
} }
} finally { } finally {
c.releaseClient(); c.releaseClient();

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

@@ -418,7 +418,8 @@ public class AssignAPProcessor {
} }
int newVal = 0; int newVal = 0;
if (type.equals(Stat.STR)) { switch (type) {
case STR:
newVal = statUpdate[0] + gain; newVal = statUpdate[0] + gain;
if (newVal > YamlConfig.config.server.MAX_AP) { if (newVal > YamlConfig.config.server.MAX_AP) {
statGain[0] += (gain - (newVal - YamlConfig.config.server.MAX_AP)); statGain[0] += (gain - (newVal - YamlConfig.config.server.MAX_AP));
@@ -427,7 +428,8 @@ public class AssignAPProcessor {
statGain[0] += gain; statGain[0] += gain;
statUpdate[0] = newVal; statUpdate[0] = newVal;
} }
} else if (type.equals(Stat.INT)) { break;
case INT:
newVal = statUpdate[3] + gain; newVal = statUpdate[3] + gain;
if (newVal > YamlConfig.config.server.MAX_AP) { if (newVal > YamlConfig.config.server.MAX_AP) {
statGain[3] += (gain - (newVal - YamlConfig.config.server.MAX_AP)); statGain[3] += (gain - (newVal - YamlConfig.config.server.MAX_AP));
@@ -436,7 +438,8 @@ public class AssignAPProcessor {
statGain[3] += gain; statGain[3] += gain;
statUpdate[3] = newVal; statUpdate[3] = newVal;
} }
} else if (type.equals(Stat.LUK)) { break;
case LUK:
newVal = statUpdate[2] + gain; newVal = statUpdate[2] + gain;
if (newVal > YamlConfig.config.server.MAX_AP) { if (newVal > YamlConfig.config.server.MAX_AP) {
statGain[2] += (gain - (newVal - YamlConfig.config.server.MAX_AP)); statGain[2] += (gain - (newVal - YamlConfig.config.server.MAX_AP));
@@ -445,7 +448,8 @@ public class AssignAPProcessor {
statGain[2] += gain; statGain[2] += gain;
statUpdate[2] = newVal; statUpdate[2] = newVal;
} }
} else if (type.equals(Stat.DEX)) { break;
case DEX:
newVal = statUpdate[1] + gain; newVal = statUpdate[1] + gain;
if (newVal > YamlConfig.config.server.MAX_AP) { if (newVal > YamlConfig.config.server.MAX_AP) {
statGain[1] += (gain - (newVal - YamlConfig.config.server.MAX_AP)); statGain[1] += (gain - (newVal - YamlConfig.config.server.MAX_AP));
@@ -454,6 +458,7 @@ public class AssignAPProcessor {
statGain[1] += gain; statGain[1] += gain;
statUpdate[1] = newVal; statUpdate[1] = newVal;
} }
break;
} }
if (newVal > YamlConfig.config.server.MAX_AP) { if (newVal > YamlConfig.config.server.MAX_AP) {

5
src/main/java/config/YamlConfig.java
View File

@@ -4,8 +4,9 @@ import com.esotericsoftware.yamlbeans.YamlReader;
import constants.string.CharsetConstants; import constants.string.CharsetConstants;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.List; import java.util.List;
@@ -18,7 +19,7 @@ public class YamlConfig {
private static YamlConfig loadConfig() { private static YamlConfig loadConfig() {
try { try {
YamlReader reader = new YamlReader(new FileReader(CONFIG_FILE_NAME, CharsetConstants.CHARSET)); YamlReader reader = new YamlReader(Files.newBufferedReader(Paths.get(CONFIG_FILE_NAME), CharsetConstants.CHARSET));
YamlConfig config = reader.read(YamlConfig.class); YamlConfig config = reader.read(YamlConfig.class);
reader.close(); reader.close();
return config; return config;

5
src/main/java/constants/string/CharsetConstants.java
View File

@@ -19,10 +19,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.Optional; import java.util.Optional;
@@ -61,7 +62,7 @@ public class CharsetConstants {
private static String loadCharsetFromConfig() { private static String loadCharsetFromConfig() {
try { try {
YamlReader reader = new YamlReader(new FileReader(YamlConfig.CONFIG_FILE_NAME, StandardCharsets.US_ASCII)); YamlReader reader = new YamlReader(Files.newBufferedReader(Paths.get(YamlConfig.CONFIG_FILE_NAME), StandardCharsets.US_ASCII));
reader.getConfig().readConfig.setIgnoreUnknownProperties(true); reader.getConfig().readConfig.setIgnoreUnknownProperties(true);
StrippedYamlConfig charsetConfig = reader.read(StrippedYamlConfig.class); StrippedYamlConfig charsetConfig = reader.read(StrippedYamlConfig.class);
reader.close(); reader.close();

6
src/main/java/net/server/Server.java
View File

@@ -1934,13 +1934,7 @@ public class Server {
new Thread(() -> System.exit(0)).start(); new Thread(() -> System.exit(0)).start();
} else { } else {
log.info("Restarting the server..."); log.info("Restarting the server...");
try {
instance.finalize();//FUU I CAN AND IT'S FREE
} catch (Throwable ex) {
ex.printStackTrace();
}
instance = null; instance = null;
System.gc();
getInstance().init();//DID I DO EVERYTHING?! D: getInstance().init();//DID I DO EVERYTHING?! D:
} }
} }

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

@@ -303,28 +303,21 @@ public final class BBSOperationHandler extends AbstractPacketHandler {
try (Connection con = DatabaseConnection.getConnection()) { try (Connection con = DatabaseConnection.getConnection()) {
// TODO clean up this block and use try-with-resources // TODO clean up this block and use try-with-resources
PreparedStatement ps2;
try (PreparedStatement ps = con.prepareStatement("SELECT * FROM bbs_threads WHERE guildid = ? AND " + (bIsThreadIdLocal ? "local" : "") + "threadid = ?")) { try (PreparedStatement ps = con.prepareStatement("SELECT * FROM bbs_threads WHERE guildid = ? AND " + (bIsThreadIdLocal ? "local" : "") + "threadid = ?")) {
ps.setInt(1, mc.getGuildId()); ps.setInt(1, mc.getGuildId());
ps.setInt(2, threadid); ps.setInt(2, threadid);
ResultSet threadRS = ps.executeQuery(); ResultSet threadRS = ps.executeQuery();
if (!threadRS.next()) { if (!threadRS.next()) {
threadRS.close();
ps.close();
return; return;
} }
ResultSet repliesRS = null; ResultSet repliesRS = null;
ps2 = null; try (PreparedStatement ps2 = con.prepareStatement("SELECT * FROM bbs_replies WHERE threadid = ?")) {
if (threadRS.getInt("replycount") >= 0) { if (threadRS.getInt("replycount") >= 0) {
ps2 = con.prepareStatement("SELECT * FROM bbs_replies WHERE threadid = ?");
ps2.setInt(1, !bIsThreadIdLocal ? threadid : threadRS.getInt("threadid")); ps2.setInt(1, !bIsThreadIdLocal ? threadid : threadRS.getInt("threadid"));
repliesRS = ps2.executeQuery(); repliesRS = ps2.executeQuery();
} }
client.sendPacket(GuildPackets.showThread(bIsThreadIdLocal ? threadid : threadRS.getInt("localthreadid"), threadRS, repliesRS)); client.sendPacket(GuildPackets.showThread(bIsThreadIdLocal ? threadid : threadRS.getInt("localthreadid"), threadRS, repliesRS));
repliesRS.close();
} }
if (ps2 != null) {
ps2.close();
} }
} catch (SQLException se) { } catch (SQLException se) {
log.error("Error displaying thread", se); log.error("Error displaying thread", se);

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

@@ -269,8 +269,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
cs.removeFromInventory(item); cs.removeFromInventory(item);
c.sendPacket(PacketCreator.takeFromCashInventory(item)); c.sendPacket(PacketCreator.takeFromCashInventory(item));
if (item instanceof Equip) { if (item instanceof Equip equip) {
Equip equip = (Equip) item;
if (equip.getRingId() >= 0) { if (equip.getRingId() >= 0) {
Ring ring = Ring.loadFromDb(equip.getRingId()); Ring ring = Ring.loadFromDb(equip.getRingId());
chr.addPlayerRing(ring); chr.addPlayerRing(ring);
@@ -323,8 +322,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
return; return;
}*/ //Gotta let them faggots marry too, hence why this is commented out <3 }*/ //Gotta let them faggots marry too, hence why this is commented out <3
if (itemRing.toItem() instanceof Equip) { if (itemRing.toItem() instanceof Equip eqp) {
Equip eqp = (Equip) itemRing.toItem();
Pair<Integer, Integer> rings = Ring.createRing(itemRing.getItemId(), chr, partner); Pair<Integer, Integer> rings = Ring.createRing(itemRing.getItemId(), chr, partner);
eqp.setRingId(rings.getLeft()); eqp.setRingId(rings.getLeft());
cs.addToInventory(eqp); cs.addToInventory(eqp);
@@ -387,8 +385,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.showCashShopMessage((byte) 0xBE)); c.sendPacket(PacketCreator.showCashShopMessage((byte) 0xBE));
} else { } else {
// Need to check to make sure its actually an equip and the right SN... // Need to check to make sure its actually an equip and the right SN...
if (itemRing.toItem() instanceof Equip) { if (itemRing.toItem() instanceof Equip eqp) {
Equip eqp = (Equip) itemRing.toItem();
Pair<Integer, Integer> rings = Ring.createRing(itemRing.getItemId(), chr, partner); Pair<Integer, Integer> rings = Ring.createRing(itemRing.getItemId(), chr, partner);
eqp.setRingId(rings.getLeft()); eqp.setRingId(rings.getLeft());
cs.addToInventory(eqp); cs.addToInventory(eqp);

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

@@ -36,8 +36,7 @@ public final class CharInfoRequestHandler extends AbstractPacketHandler {
int cid = p.readInt(); int cid = p.readInt();
MapObject target = c.getPlayer().getMap().getMapObject(cid); MapObject target = c.getPlayer().getMap().getMapObject(cid);
if (target != null) { if (target != null) {
if (target instanceof Character) { if (target instanceof Character player) {
Character player = (Character) target;
if (c.getPlayer().getId() != player.getId()) { if (c.getPlayer().getId() != player.getId()) {
player.exportExcludedItems(c); player.exportExcludedItems(c);

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

@@ -45,8 +45,7 @@ public final class DoorHandler extends AbstractPacketHandler {
} }
for (MapObject obj : chr.getMap().getMapObjects()) { for (MapObject obj : chr.getMap().getMapObjects()) {
if (obj instanceof DoorObject) { if (obj instanceof DoorObject door) {
DoorObject door = (DoorObject) obj;
if (door.getOwnerId() == ownerid) { if (door.getOwnerId() == ownerid) {
door.warp(chr); door.warp(chr);
return; return;

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

@@ -47,8 +47,7 @@ public final class HiredMerchantRequest extends AbstractPacketHandler {
try { try {
for (MapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapObjectType.HIRED_MERCHANT, MapObjectType.PLAYER))) { for (MapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapObjectType.HIRED_MERCHANT, MapObjectType.PLAYER))) {
if (mmo instanceof Character) { if (mmo instanceof Character mc) {
Character mc = (Character) mmo;
PlayerShop shop = mc.getPlayerShop(); PlayerShop shop = mc.getPlayerShop();
if (shop != null && shop.isOwner(mc)) { if (shop != null && shop.isOwner(mc)) {

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

@@ -61,7 +61,8 @@ public final class MTSHandler extends AbstractPacketHandler {
} }
if (p.available() > 0) { if (p.available() > 0) {
byte op = p.readByte(); byte op = p.readByte();
if (op == 2) { //put item up for sale switch (op) {
case 2: { //put item up for sale
byte itemtype = p.readByte(); byte itemtype = p.readByte();
int itemid = p.readInt(); int itemid = p.readInt();
p.readShort(); p.readShort();
@@ -108,11 +109,8 @@ public final class MTSHandler extends AbstractPacketHandler {
InventoryType invType = ItemConstants.getInventoryType(itemid); InventoryType invType = ItemConstants.getInventoryType(itemid);
Item i = c.getPlayer().getInventory(invType).getItem(slot).copy(); Item i = c.getPlayer().getInventory(invType).getItem(slot).copy();
if (i != null && c.getPlayer().getMeso() >= 5000) { if (i != null && c.getPlayer().getMeso() >= 5000) {
Connection con = null; try (Connection con = DatabaseConnection.getConnection();
try { PreparedStatement ps = con.prepareStatement("SELECT COUNT(*) FROM mts_items WHERE seller = ?");) {
con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT COUNT(*) FROM mts_items WHERE seller = ?");
ps.setInt(1, c.getPlayer().getId()); ps.setInt(1, c.getPlayer().getId());
ResultSet rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
if (rs.next()) { if (rs.next()) {
@@ -121,13 +119,9 @@ public final class MTSHandler extends AbstractPacketHandler {
c.sendPacket(getMTS(1, 0, 0)); c.sendPacket(getMTS(1, 0, 0));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
rs.close();
ps.close();
return; return;
} }
} }
rs.close();
ps.close();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
int year; int year;
int month; int month;
@@ -164,61 +158,62 @@ public final class MTSHandler extends AbstractPacketHandler {
} }
if (!i.getInventoryType().equals(InventoryType.EQUIP)) { if (!i.getInventoryType().equals(InventoryType.EQUIP)) {
Item item = i; Item item = i;
ps = con.prepareStatement("INSERT INTO mts_items (tab, type, itemid, quantity, expiration, giftFrom, seller, price, owner, sellername, sell_ends) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); try (PreparedStatement pse = con.prepareStatement("INSERT INTO mts_items (tab, type, itemid, quantity, expiration, giftFrom, seller, price, owner, sellername, sell_ends) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) {
ps.setInt(1, 1); pse.setInt(1, 1);
ps.setInt(2, invType.getType()); pse.setInt(2, invType.getType());
ps.setInt(3, item.getItemId()); pse.setInt(3, item.getItemId());
ps.setInt(4, quantity); pse.setInt(4, quantity);
ps.setLong(5, item.getExpiration()); pse.setLong(5, item.getExpiration());
ps.setString(6, item.getGiftFrom()); pse.setString(6, item.getGiftFrom());
ps.setInt(7, c.getPlayer().getId()); pse.setInt(7, c.getPlayer().getId());
ps.setInt(8, price); pse.setInt(8, price);
ps.setString(9, item.getOwner()); pse.setString(9, item.getOwner());
ps.setString(10, c.getPlayer().getName()); pse.setString(10, c.getPlayer().getName());
ps.setString(11, date); pse.setString(11, date);
pse.executeUpdate();
}
} else { } else {
Equip equip = (Equip) i; Equip equip = (Equip) i;
ps = con.prepareStatement("INSERT INTO mts_items (tab, type, itemid, quantity, expiration, giftFrom, seller, price, upgradeslots, level, str, dex, `int`, luk, hp, mp, watk, matk, wdef, mdef, acc, avoid, hands, speed, jump, locked, owner, sellername, sell_ends, vicious, flag, itemexp, itemlevel, ringid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); try (PreparedStatement pse = con.prepareStatement("INSERT INTO mts_items (tab, type, itemid, quantity, expiration, giftFrom, seller, price, upgradeslots, level, str, dex, `int`, luk, hp, mp, watk, matk, wdef, mdef, acc, avoid, hands, speed, jump, locked, owner, sellername, sell_ends, vicious, flag, itemexp, itemlevel, ringid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")) {
ps.setInt(1, 1); pse.setInt(1, 1);
ps.setInt(2, invType.getType()); pse.setInt(2, invType.getType());
ps.setInt(3, equip.getItemId()); pse.setInt(3, equip.getItemId());
ps.setInt(4, quantity); pse.setInt(4, quantity);
ps.setLong(5, equip.getExpiration()); pse.setLong(5, equip.getExpiration());
ps.setString(6, equip.getGiftFrom()); pse.setString(6, equip.getGiftFrom());
ps.setInt(7, c.getPlayer().getId()); pse.setInt(7, c.getPlayer().getId());
ps.setInt(8, price); pse.setInt(8, price);
ps.setInt(9, equip.getUpgradeSlots()); pse.setInt(9, equip.getUpgradeSlots());
ps.setInt(10, equip.getLevel()); pse.setInt(10, equip.getLevel());
ps.setInt(11, equip.getStr()); pse.setInt(11, equip.getStr());
ps.setInt(12, equip.getDex()); pse.setInt(12, equip.getDex());
ps.setInt(13, equip.getInt()); pse.setInt(13, equip.getInt());
ps.setInt(14, equip.getLuk()); pse.setInt(14, equip.getLuk());
ps.setInt(15, equip.getHp()); pse.setInt(15, equip.getHp());
ps.setInt(16, equip.getMp()); pse.setInt(16, equip.getMp());
ps.setInt(17, equip.getWatk()); pse.setInt(17, equip.getWatk());
ps.setInt(18, equip.getMatk()); pse.setInt(18, equip.getMatk());
ps.setInt(19, equip.getWdef()); pse.setInt(19, equip.getWdef());
ps.setInt(20, equip.getMdef()); pse.setInt(20, equip.getMdef());
ps.setInt(21, equip.getAcc()); pse.setInt(21, equip.getAcc());
ps.setInt(22, equip.getAvoid()); pse.setInt(22, equip.getAvoid());
ps.setInt(23, equip.getHands()); pse.setInt(23, equip.getHands());
ps.setInt(24, equip.getSpeed()); pse.setInt(24, equip.getSpeed());
ps.setInt(25, equip.getJump()); pse.setInt(25, equip.getJump());
ps.setInt(26, 0); pse.setInt(26, 0);
ps.setString(27, equip.getOwner()); pse.setString(27, equip.getOwner());
ps.setString(28, c.getPlayer().getName()); pse.setString(28, c.getPlayer().getName());
ps.setString(29, date); pse.setString(29, date);
ps.setInt(30, equip.getVicious()); pse.setInt(30, equip.getVicious());
ps.setInt(31, equip.getFlag()); pse.setInt(31, equip.getFlag());
ps.setInt(32, equip.getItemExp()); pse.setInt(32, equip.getItemExp());
ps.setByte(33, equip.getItemLevel()); // thanks Jefe for noticing missing itemlevel labels pse.setByte(33, equip.getItemLevel()); // thanks Jefe for noticing missing itemlevel labels
ps.setInt(34, equip.getRingId()); pse.setInt(34, equip.getRingId());
pse.executeUpdate();
}
} }
ps.executeUpdate();
ps.close();
InventoryManipulator.removeFromSlot(c, invType, slot, quantity, false); InventoryManipulator.removeFromSlot(c, invType, slot, quantity, false);
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -229,14 +224,18 @@ public final class MTSHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} }
} else if (op == 3) { //send offer for wanted item break;
} else if (op == 4) { //list wanted item }
case 3: //send offer for wanted item
break;
case 4: //list wanted item
p.readInt(); p.readInt();
p.readInt(); p.readInt();
p.readInt(); p.readInt();
p.readShort(); p.readShort();
p.readString(); p.readString();
} else if (op == 5) { //change page break;
case 5: { //change page
int tab = p.readInt(); int tab = p.readInt();
int type = p.readInt(); int type = p.readInt();
int page = p.readInt(); int page = p.readInt();
@@ -254,7 +253,9 @@ public final class MTSHandler extends AbstractPacketHandler {
c.enableCSActions(); c.enableCSActions();
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 6) { //search break;
}
case 6: { //search
int tab = p.readInt(); int tab = p.readInt();
int type = p.readInt(); int type = p.readInt();
p.readInt(); p.readInt();
@@ -270,45 +271,46 @@ public final class MTSHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.showMTSCash(c.getPlayer())); c.sendPacket(PacketCreator.showMTSCash(c.getPlayer()));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 7) { //cancel sale break;
}
case 7: { //cancel sale
int id = p.readInt(); // id of the item int id = p.readInt(); // id of the item
Connection con = null; try (Connection con = DatabaseConnection.getConnection()) {
try { try (PreparedStatement ps = con.prepareStatement("UPDATE mts_items SET transfer = 1 WHERE id = ? AND seller = ?")) {
con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("UPDATE mts_items SET transfer = 1 WHERE id = ? AND seller = ?");
ps.setInt(1, id); ps.setInt(1, id);
ps.setInt(2, c.getPlayer().getId()); ps.setInt(2, c.getPlayer().getId());
ps.executeUpdate(); ps.executeUpdate();
ps.close(); }
ps = con.prepareStatement("DELETE FROM mts_cart WHERE itemid = ?");
try (PreparedStatement ps = con.prepareStatement("DELETE FROM mts_cart WHERE itemid = ?")) {
ps.setInt(1, id); ps.setInt(1, id);
ps.executeUpdate(); ps.executeUpdate();
ps.close(); }
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }
c.enableCSActions(); c.enableCSActions();
c.sendPacket(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage())); c.sendPacket(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(),
c.getPlayer().getCurrentPage()));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
} else if (op == 8) { //transfer item from transfer inv. break;
}
case 8: { // transfer item from transfer inv.
int id = p.readInt(); // id of the item int id = p.readInt(); // id of the item
Connection con = null; try (Connection con = DatabaseConnection.getConnection()) {
PreparedStatement ps; try (PreparedStatement ps = con.prepareStatement("SELECT * FROM mts_items WHERE seller = ? AND transfer = 1 AND id= ? ORDER BY id DESC")) {
ResultSet rs;
try {
con = DatabaseConnection.getConnection();
ps = con.prepareStatement("SELECT * FROM mts_items WHERE seller = ? AND transfer = 1 AND id= ? ORDER BY id DESC");
ps.setInt(1, c.getPlayer().getId()); ps.setInt(1, c.getPlayer().getId());
ps.setInt(2, id); ps.setInt(2, id);
rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
if (rs.next()) { if (rs.next()) {
Item i; Item i;
if (rs.getInt("type") != 1) { if (rs.getInt("type") != 1) {
Item ii = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity")); Item ii = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity"));
ii.setOwner(rs.getString("owner")); ii.setOwner(rs.getString("owner"));
ii.setPosition(c.getPlayer().getInventory(ItemConstants.getInventoryType(rs.getInt("itemid"))).getNextFreeSlot()); ii.setPosition(
c.getPlayer().getInventory(ItemConstants.getInventoryType(rs.getInt("itemid")))
.getNextFreeSlot());
i = ii.copy(); i = ii.copy();
} else { } else {
Equip equip = new Equip(rs.getInt("itemid"), (byte) rs.getInt("position"), -1); Equip equip = new Equip(rs.getInt("itemid"), (byte) rs.getInt("position"), -1);
@@ -338,10 +340,13 @@ public final class MTSHandler extends AbstractPacketHandler {
equip.setFlag((short) rs.getInt("flag")); equip.setFlag((short) rs.getInt("flag"));
equip.setExpiration(rs.getLong("expiration")); equip.setExpiration(rs.getLong("expiration"));
equip.setGiftFrom(rs.getString("giftFrom")); equip.setGiftFrom(rs.getString("giftFrom"));
equip.setPosition(c.getPlayer().getInventory(ItemConstants.getInventoryType(rs.getInt("itemid"))).getNextFreeSlot()); equip.setPosition(
c.getPlayer().getInventory(ItemConstants.getInventoryType(rs.getInt("itemid")))
.getNextFreeSlot());
i = equip.copy(); i = equip.copy();
} }
try (PreparedStatement pse = con.prepareStatement("DELETE FROM mts_items WHERE id = ? AND seller = ? AND transfer = 1")) { try (PreparedStatement pse = con.prepareStatement(
"DELETE FROM mts_items WHERE id = ? AND seller = ? AND transfer = 1")) {
pse.setInt(1, id); pse.setInt(1, id);
pse.setInt(2, c.getPlayer().getId()); pse.setInt(2, c.getPlayer().getId());
pse.executeUpdate(); pse.executeUpdate();
@@ -349,21 +354,20 @@ public final class MTSHandler extends AbstractPacketHandler {
InventoryManipulator.addFromDrop(c, i, false); InventoryManipulator.addFromDrop(c, i, false);
c.enableCSActions(); c.enableCSActions();
c.sendPacket(getCart(c.getPlayer().getId())); c.sendPacket(getCart(c.getPlayer().getId()));
c.sendPacket(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage())); c.sendPacket(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(),
c.getPlayer().getCurrentPage()));
c.sendPacket(PacketCreator.MTSConfirmTransfer(i.getQuantity(), i.getPosition())); c.sendPacket(PacketCreator.MTSConfirmTransfer(i.getQuantity(), i.getPosition()));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
} }
rs.close(); }
ps.close();
con.close();
} catch (SQLException e) { } catch (SQLException e) {
log.error("MTS Transfer error", e); log.error("MTS Transfer error", e);
} }
} else if (op == 9) { //add to cart break;
}
case 9: { //add to cart
int id = p.readInt(); // id of the item int id = p.readInt(); // id of the item
Connection con; try (Connection con = DatabaseConnection.getConnection()) {
try {
con = DatabaseConnection.getConnection();
try (PreparedStatement ps1 = con.prepareStatement("SELECT id FROM mts_items WHERE id = ? AND seller <> ?")) { try (PreparedStatement ps1 = con.prepareStatement("SELECT id FROM mts_items WHERE id = ? AND seller <> ?")) {
ps1.setInt(1, id); // Dummy query, prevents adding to cart self owned items ps1.setInt(1, id); // Dummy query, prevents adding to cart self owned items
ps1.setInt(2, c.getPlayer().getId()); ps1.setInt(2, c.getPlayer().getId());
@@ -384,7 +388,6 @@ public final class MTSHandler extends AbstractPacketHandler {
} }
} }
} }
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -393,17 +396,16 @@ public final class MTSHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions()); c.sendPacket(PacketCreator.enableActions());
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 10) { //delete from cart break;
}
case 10: { //delete from cart
int id = p.readInt(); // id of the item int id = p.readInt(); // id of the item
Connection con = null; try (Connection con = DatabaseConnection.getConnection()) {
try {
con = DatabaseConnection.getConnection();
try (PreparedStatement ps = con.prepareStatement("DELETE FROM mts_cart WHERE itemid = ? AND cid = ?")) { try (PreparedStatement ps = con.prepareStatement("DELETE FROM mts_cart WHERE itemid = ? AND cid = ?")) {
ps.setInt(1, id); ps.setInt(1, id);
ps.setInt(2, c.getPlayer().getId()); ps.setInt(2, c.getPlayer().getId());
ps.executeUpdate(); ps.executeUpdate();
} }
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -411,19 +413,20 @@ public final class MTSHandler extends AbstractPacketHandler {
c.enableCSActions(); c.enableCSActions();
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId()))); c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId()))); c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 12) { //put item up for auction break;
} else if (op == 13) { //cancel wanted cart thing }
} else if (op == 14) { //buy auction item now case 12: //put item up for auction
} else if (op == 16) { //buy break;
case 13: //cancel wanted cart thing
break;
case 14: //buy auction item now
break;
case 16: { //buy
int id = p.readInt(); // id of the item int id = p.readInt(); // id of the item
Connection con = null; try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps; PreparedStatement ps = con.prepareStatement("SELECT * FROM mts_items WHERE id = ? ORDER BY id DESC")) {
ResultSet rs;
try {
con = DatabaseConnection.getConnection();
ps = con.prepareStatement("SELECT * FROM mts_items WHERE id = ? ORDER BY id DESC");
ps.setInt(1, id); ps.setInt(1, id);
rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
if (rs.next()) { if (rs.next()) {
int price = rs.getInt("price") + 100 + (int) (rs.getInt("price") * 0.1); // taxes int price = rs.getInt("price") + 100 + (int) (rs.getInt("price") * 0.1); // taxes
if (c.getPlayer().getCashShop().getCash(4) >= price) { // FIX if (c.getPlayer().getCashShop().getCash(4) >= price) { // FIX
@@ -436,10 +439,9 @@ public final class MTSHandler extends AbstractPacketHandler {
} }
} }
if (alwaysnull) { if (alwaysnull) {
ResultSet rse;
try (PreparedStatement pse = con.prepareStatement("SELECT accountid FROM characters WHERE id = ?")) { try (PreparedStatement pse = con.prepareStatement("SELECT accountid FROM characters WHERE id = ?")) {
pse.setInt(1, rs.getInt("seller")); pse.setInt(1, rs.getInt("seller"));
rse = pse.executeQuery(); ResultSet rse = pse.executeQuery();
if (rse.next()) { if (rse.next()) {
try (PreparedStatement psee = con.prepareStatement("UPDATE accounts SET nxPrepaid = nxPrepaid + ? WHERE id = ?")) { try (PreparedStatement psee = con.prepareStatement("UPDATE accounts SET nxPrepaid = nxPrepaid + ? WHERE id = ?")) {
psee.setInt(1, rs.getInt("price")); psee.setInt(1, rs.getInt("price"));
@@ -448,17 +450,16 @@ public final class MTSHandler extends AbstractPacketHandler {
} }
} }
} }
rse.close();
} }
PreparedStatement pse = con.prepareStatement("UPDATE mts_items SET seller = ?, transfer = 1 WHERE id = ?"); try (PreparedStatement pse = con.prepareStatement("UPDATE mts_items SET seller = ?, transfer = 1 WHERE id = ?")) {
pse.setInt(1, c.getPlayer().getId()); pse.setInt(1, c.getPlayer().getId());
pse.setInt(2, id); pse.setInt(2, id);
pse.executeUpdate(); pse.executeUpdate();
pse.close(); }
pse = con.prepareStatement("DELETE FROM mts_cart WHERE itemid = ?"); try (PreparedStatement pse = con.prepareStatement("DELETE FROM mts_cart WHERE itemid = ?")) {
pse.setInt(1, id); pse.setInt(1, id);
pse.executeUpdate(); pse.executeUpdate();
pse.close(); }
c.getPlayer().getCashShop().gainCash(4, -price); c.getPlayer().getCashShop().gainCash(4, -price);
c.enableCSActions(); c.enableCSActions();
c.sendPacket(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(),c.getPlayer().getCurrentPage())); c.sendPacket(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(),c.getPlayer().getCurrentPage()));
@@ -471,23 +472,18 @@ public final class MTSHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.MTSFailBuy()); c.sendPacket(PacketCreator.MTSFailBuy());
} }
} }
rs.close();
ps.close();
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
c.sendPacket(PacketCreator.MTSFailBuy()); c.sendPacket(PacketCreator.MTSFailBuy());
} }
} else if (op == 17) { //buy from cart break;
}
case 17: { //buy from cart
int id = p.readInt(); // id of the item int id = p.readInt(); // id of the item
Connection con = null; try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps; PreparedStatement ps = con.prepareStatement("SELECT * FROM mts_items WHERE id = ? ORDER BY id DESC")) {
ResultSet rs;
try {
con = DatabaseConnection.getConnection();
ps = con.prepareStatement("SELECT * FROM mts_items WHERE id = ? ORDER BY id DESC");
ps.setInt(1, id); ps.setInt(1, id);
rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
if (rs.next()) { if (rs.next()) {
int price = rs.getInt("price") + 100 + (int) (rs.getInt("price") * 0.1); int price = rs.getInt("price") + 100 + (int) (rs.getInt("price") * 0.1);
if (c.getPlayer().getCashShop().getCash(4) >= price) { if (c.getPlayer().getCashShop().getCash(4) >= price) {
@@ -496,10 +492,9 @@ public final class MTSHandler extends AbstractPacketHandler {
if (victim != null) { if (victim != null) {
victim.getCashShop().gainCash(4, rs.getInt("price")); victim.getCashShop().gainCash(4, rs.getInt("price"));
} else { } else {
ResultSet rse;
try (PreparedStatement pse = con.prepareStatement("SELECT accountid FROM characters WHERE id = ?")) { try (PreparedStatement pse = con.prepareStatement("SELECT accountid FROM characters WHERE id = ?")) {
pse.setInt(1, rs.getInt("seller")); pse.setInt(1, rs.getInt("seller"));
rse = pse.executeQuery(); ResultSet rse = pse.executeQuery();
if (rse.next()) { if (rse.next()) {
try (PreparedStatement psee = con.prepareStatement("UPDATE accounts SET nxPrepaid = nxPrepaid + ? WHERE id = ?")) { try (PreparedStatement psee = con.prepareStatement("UPDATE accounts SET nxPrepaid = nxPrepaid + ? WHERE id = ?")) {
psee.setInt(1, rs.getInt("price")); psee.setInt(1, rs.getInt("price"));
@@ -508,18 +503,17 @@ public final class MTSHandler extends AbstractPacketHandler {
} }
} }
} }
rse.close();
} }
} }
PreparedStatement pse = con.prepareStatement("UPDATE mts_items SET seller = ?, transfer = 1 WHERE id = ?"); try (PreparedStatement pse = con.prepareStatement("UPDATE mts_items SET seller = ?, transfer = 1 WHERE id = ?")) {
pse.setInt(1, c.getPlayer().getId()); pse.setInt(1, c.getPlayer().getId());
pse.setInt(2, id); pse.setInt(2, id);
pse.executeUpdate(); pse.executeUpdate();
pse.close(); }
pse = con.prepareStatement("DELETE FROM mts_cart WHERE itemid = ?"); try (PreparedStatement pse = con.prepareStatement("DELETE FROM mts_cart WHERE itemid = ?")) {
pse.setInt(1, id); pse.setInt(1, id);
pse.executeUpdate(); pse.executeUpdate();
pse.close(); }
c.getPlayer().getCashShop().gainCash(4, -price); c.getPlayer().getCashShop().gainCash(4, -price);
c.sendPacket(getCart(c.getPlayer().getId())); c.sendPacket(getCart(c.getPlayer().getId()));
c.enableCSActions(); c.enableCSActions();
@@ -531,15 +525,15 @@ public final class MTSHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.MTSFailBuy()); c.sendPacket(PacketCreator.MTSFailBuy());
} }
} }
rs.close();
ps.close();
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
c.sendPacket(PacketCreator.MTSFailBuy()); c.sendPacket(PacketCreator.MTSFailBuy());
} }
} else { break;
}
default:
log.warn("Unhandled OP (MTS): {}, packet: {}", op, p); log.warn("Unhandled OP (MTS): {}, packet: {}", op, p);
break;
} }
} else { } else {
c.sendPacket(PacketCreator.showMTSCash(c.getPlayer())); c.sendPacket(PacketCreator.showMTSCash(c.getPlayer()));
@@ -548,14 +542,10 @@ public final class MTSHandler extends AbstractPacketHandler {
public List<MTSItemInfo> getNotYetSold(int cid) { public List<MTSItemInfo> getNotYetSold(int cid) {
List<MTSItemInfo> items = new ArrayList<>(); List<MTSItemInfo> items = new ArrayList<>();
Connection con = null; try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps; PreparedStatement ps = con.prepareStatement("SELECT * FROM mts_items WHERE seller = ? AND transfer = 0 ORDER BY id DESC")) {
ResultSet rs;
try {
con = DatabaseConnection.getConnection();
ps = con.prepareStatement("SELECT * FROM mts_items WHERE seller = ? AND transfer = 0 ORDER BY id DESC");
ps.setInt(1, cid); ps.setInt(1, cid);
rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
while (rs.next()) { while (rs.next()) {
if (rs.getInt("type") != 1) { if (rs.getInt("type") != 1) {
Item i = new Item(rs.getInt("itemid"), (byte) 0, (short) rs.getInt("quantity")); Item i = new Item(rs.getInt("itemid"), (byte) 0, (short) rs.getInt("quantity"));
@@ -592,9 +582,6 @@ public final class MTSHandler extends AbstractPacketHandler {
items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends")));
} }
} }
rs.close();
ps.close();
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -603,15 +590,11 @@ public final class MTSHandler extends AbstractPacketHandler {
public Packet getCart(int cid) { public Packet getCart(int cid) {
List<MTSItemInfo> items = new ArrayList<>(); List<MTSItemInfo> items = new ArrayList<>();
Connection con = null;
PreparedStatement ps;
ResultSet rs;
int pages = 0; int pages = 0;
try { try (Connection con = DatabaseConnection.getConnection()) {
con = DatabaseConnection.getConnection(); try (PreparedStatement ps = con.prepareStatement("SELECT * FROM mts_cart WHERE cid = ? ORDER BY id DESC")) {
ps = con.prepareStatement("SELECT * FROM mts_cart WHERE cid = ? ORDER BY id DESC");
ps.setInt(1, cid); ps.setInt(1, cid);
rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
while (rs.next()) { while (rs.next()) {
try (PreparedStatement pse = con.prepareStatement("SELECT * FROM mts_items WHERE id = ?")) { try (PreparedStatement pse = con.prepareStatement("SELECT * FROM mts_items WHERE id = ?")) {
pse.setInt(1, rs.getInt("itemid")); pse.setInt(1, rs.getInt("itemid"));
@@ -620,7 +603,8 @@ public final class MTSHandler extends AbstractPacketHandler {
if (rse.getInt("type") != 1) { if (rse.getInt("type") != 1) {
Item i = new Item(rse.getInt("itemid"), (short) 0, (short) rse.getInt("quantity")); Item i = new Item(rse.getInt("itemid"), (short) 0, (short) rse.getInt("quantity"));
i.setOwner(rse.getString("owner")); i.setOwner(rse.getString("owner"));
items.add(new MTSItemInfo(i, rse.getInt("price"), rse.getInt("id"), rse.getInt("seller"), rse.getString("sellername"), rse.getString("sell_ends"))); items.add(new MTSItemInfo(i, rse.getInt("price"), rse.getInt("id"),
rse.getInt("seller"), rse.getString("sellername"), rse.getString("sell_ends")));
} else { } else {
Equip equip = new Equip(rse.getInt("itemid"), (byte) rse.getInt("position"), -1); Equip equip = new Equip(rse.getInt("itemid"), (byte) rse.getInt("position"), -1);
equip.setOwner(rse.getString("owner")); equip.setOwner(rse.getString("owner"));
@@ -649,25 +633,23 @@ public final class MTSHandler extends AbstractPacketHandler {
equip.setFlag((short) rs.getInt("flag")); equip.setFlag((short) rs.getInt("flag"));
equip.setExpiration(rs.getLong("expiration")); equip.setExpiration(rs.getLong("expiration"));
equip.setGiftFrom(rs.getString("giftFrom")); equip.setGiftFrom(rs.getString("giftFrom"));
items.add(new MTSItemInfo(equip, rse.getInt("price"), rse.getInt("id"), rse.getInt("seller"), rse.getString("sellername"), rse.getString("sell_ends"))); items.add(new MTSItemInfo(equip, rse.getInt("price"), rse.getInt("id"),
rse.getInt("seller"), rse.getString("sellername"), rse.getString("sell_ends")));
} }
} }
} }
} }
rs.close(); }
ps.close(); try (PreparedStatement ps = con.prepareStatement("SELECT COUNT(*) FROM mts_cart WHERE cid = ?")) {
ps = con.prepareStatement("SELECT COUNT(*) FROM mts_cart WHERE cid = ?");
ps.setInt(1, cid); ps.setInt(1, cid);
rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
if (rs.next()) { if (rs.next()) {
pages = rs.getInt(1) / 16; pages = rs.getInt(1) / 16;
if (rs.getInt(1) % 16 > 0) { if (rs.getInt(1) % 16 > 0) {
pages += 1; pages += 1;
} }
} }
rs.close(); }
ps.close();
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -676,14 +658,10 @@ public final class MTSHandler extends AbstractPacketHandler {
public List<MTSItemInfo> getTransfer(int cid) { public List<MTSItemInfo> getTransfer(int cid) {
List<MTSItemInfo> items = new ArrayList<>(); List<MTSItemInfo> items = new ArrayList<>();
Connection con = null; try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps; PreparedStatement ps = con.prepareStatement("SELECT * FROM mts_items WHERE transfer = 1 AND seller = ? ORDER BY id DESC")) {
ResultSet rs;
try {
con = DatabaseConnection.getConnection();
ps = con.prepareStatement("SELECT * FROM mts_items WHERE transfer = 1 AND seller = ? ORDER BY id DESC");
ps.setInt(1, cid); ps.setInt(1, cid);
rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
while (rs.next()) { while (rs.next()) {
if (rs.getInt("type") != 1) { if (rs.getInt("type") != 1) {
Item i = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity")); Item i = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity"));
@@ -720,9 +698,6 @@ public final class MTSHandler extends AbstractPacketHandler {
items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends")));
} }
} }
rs.close();
ps.close();
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -731,17 +706,15 @@ public final class MTSHandler extends AbstractPacketHandler {
private static Packet getMTS(int tab, int type, int page) { private static Packet getMTS(int tab, int type, int page) {
List<MTSItemInfo> items = new ArrayList<>(); List<MTSItemInfo> items = new ArrayList<>();
Connection con = null;
PreparedStatement ps;
ResultSet rs;
int pages = 0; int pages = 0;
try { try (Connection con = DatabaseConnection.getConnection()) {
con = DatabaseConnection.getConnection(); String sql;
if (type != 0) { if (type != 0) {
ps = con.prepareStatement("SELECT * FROM mts_items WHERE tab = ? AND type = ? AND transfer = 0 ORDER BY id DESC LIMIT ?, 16"); sql = "SELECT * FROM mts_items WHERE tab = ? AND type = ? AND transfer = 0 ORDER BY id DESC LIMIT ?, 16";
} else { } else {
ps = con.prepareStatement("SELECT * FROM mts_items WHERE tab = ? AND transfer = 0 ORDER BY id DESC LIMIT ?, 16"); sql = "SELECT * FROM mts_items WHERE tab = ? AND transfer = 0 ORDER BY id DESC LIMIT ?, 16";
} }
try (PreparedStatement ps = con.prepareStatement(sql)) {
ps.setInt(1, tab); ps.setInt(1, tab);
if (type != 0) { if (type != 0) {
ps.setInt(2, type); ps.setInt(2, type);
@@ -749,12 +722,13 @@ public final class MTSHandler extends AbstractPacketHandler {
} else { } else {
ps.setInt(2, page * 16); ps.setInt(2, page * 16);
} }
rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
while (rs.next()) { while (rs.next()) {
if (rs.getInt("type") != 1) { if (rs.getInt("type") != 1) {
Item i = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity")); Item i = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity"));
i.setOwner(rs.getString("owner")); i.setOwner(rs.getString("owner"));
items.add(new MTSItemInfo(i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); items.add(new MTSItemInfo(i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"),
rs.getString("sellername"), rs.getString("sell_ends")));
} else { } else {
Equip equip = new Equip(rs.getInt("itemid"), (byte) rs.getInt("position"), -1); Equip equip = new Equip(rs.getInt("itemid"), (byte) rs.getInt("position"), -1);
equip.setOwner(rs.getString("owner")); equip.setOwner(rs.getString("owner"));
@@ -786,23 +760,20 @@ public final class MTSHandler extends AbstractPacketHandler {
items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends")));
} }
} }
rs.close(); }
ps.close(); try (PreparedStatement ps = con.prepareStatement("SELECT COUNT(*) FROM mts_items WHERE tab = ? " + (type != 0 ? "AND type = ?" : "") + "AND transfer = 0")) {
ps = con.prepareStatement("SELECT COUNT(*) FROM mts_items WHERE tab = ? " + (type != 0 ? "AND type = ?" : "") + "AND transfer = 0");
ps.setInt(1, tab); ps.setInt(1, tab);
if (type != 0) { if (type != 0) {
ps.setInt(2, type); ps.setInt(2, type);
} }
rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
if (rs.next()) { if (rs.next()) {
pages = rs.getInt(1) / 16; pages = rs.getInt(1) / 16;
if (rs.getInt(1) % 16 > 0) { if (rs.getInt(1) % 16 > 0) {
pages++; pages++;
} }
} }
rs.close(); }
ps.close();
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -830,17 +801,15 @@ public final class MTSHandler extends AbstractPacketHandler {
} else { } else {
listaitems = " AND sellername LIKE CONCAT('%','" + search + "', '%')"; listaitems = " AND sellername LIKE CONCAT('%','" + search + "', '%')";
} }
Connection con = null;
PreparedStatement ps;
ResultSet rs;
int pages = 0; int pages = 0;
try { try (Connection con = DatabaseConnection.getConnection()){
con = DatabaseConnection.getConnection(); String sql;
if (type != 0) { if (type != 0) {
ps = con.prepareStatement("SELECT * FROM mts_items WHERE tab = ? " + listaitems + " AND type = ? AND transfer = 0 ORDER BY id DESC LIMIT ?, 16"); sql = "SELECT * FROM mts_items WHERE tab = ? " + listaitems + " AND type = ? AND transfer = 0 ORDER BY id DESC LIMIT ?, 16";
} else { } else {
ps = con.prepareStatement("SELECT * FROM mts_items WHERE tab = ? " + listaitems + " AND transfer = 0 ORDER BY id DESC LIMIT ?, 16"); sql = "SELECT * FROM mts_items WHERE tab = ? " + listaitems + " AND transfer = 0 ORDER BY id DESC LIMIT ?, 16";
} }
try (PreparedStatement ps = con.prepareStatement(sql)) {
ps.setInt(1, tab); ps.setInt(1, tab);
if (type != 0) { if (type != 0) {
ps.setInt(2, type); ps.setInt(2, type);
@@ -848,7 +817,7 @@ public final class MTSHandler extends AbstractPacketHandler {
} else { } else {
ps.setInt(2, page * 16); ps.setInt(2, page * 16);
} }
rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
while (rs.next()) { while (rs.next()) {
if (rs.getInt("type") != 1) { if (rs.getInt("type") != 1) {
Item i = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity")); Item i = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity"));
@@ -885,25 +854,22 @@ public final class MTSHandler extends AbstractPacketHandler {
items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends")));
} }
} }
rs.close(); }
ps.close();
if (type == 0) { if (type == 0) {
ps = con.prepareStatement("SELECT COUNT(*) FROM mts_items WHERE tab = ? " + listaitems + " AND transfer = 0"); try (PreparedStatement ps = con.prepareStatement("SELECT COUNT(*) FROM mts_items WHERE tab = ? " + listaitems + " AND transfer = 0")) {
ps.setInt(1, tab); ps.setInt(1, tab);
if (type != 0) { if (type != 0) {
ps.setInt(2, type); ps.setInt(2, type);
} }
rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
if (rs.next()) { if (rs.next()) {
pages = rs.getInt(1) / 16; pages = rs.getInt(1) / 16;
if (rs.getInt(1) % 16 > 0) { if (rs.getInt(1) % 16 > 0) {
pages++; pages++;
} }
} }
rs.close();
ps.close();
} }
con.close(); }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }

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

@@ -52,20 +52,28 @@ public final class MobDamageMobFriendlyHandler extends AbstractPacketHandler {
int damage = Randomizer.nextInt(((monster.getMaxHp() / 13 + monster.getPADamage() * 10)) * 2 + 500) / 10; // Formula planned by Beng. int damage = Randomizer.nextInt(((monster.getMaxHp() / 13 + monster.getPADamage() * 10)) * 2 + 500) / 10; // Formula planned by Beng.
if (monster.getHp() - damage < 1) { // friendly dies if (monster.getHp() - damage < 1) { // friendly dies
if (monster.getId() == MobId.WATCH_HOG) { switch (monster.getId()) {
case MobId.WATCH_HOG:
map.broadcastMessage(PacketCreator.serverNotice(6, "The Watch Hog has been injured by the aliens. Better luck next time...")); map.broadcastMessage(PacketCreator.serverNotice(6, "The Watch Hog has been injured by the aliens. Better luck next time..."));
} else if (monster.getId() == MobId.MOON_BUNNY) { //moon bunny break;
case MobId.MOON_BUNNY: //moon bunny
map.broadcastMessage(PacketCreator.serverNotice(6, "The Moon Bunny went home because he was sick.")); map.broadcastMessage(PacketCreator.serverNotice(6, "The Moon Bunny went home because he was sick."));
} else if (monster.getId() == MobId.TYLUS) { //tylus break;
case MobId.TYLUS: //tylus
map.broadcastMessage(PacketCreator.serverNotice(6, "Tylus has fallen by the overwhelming forces of the ambush.")); map.broadcastMessage(PacketCreator.serverNotice(6, "Tylus has fallen by the overwhelming forces of the ambush."));
} else if (monster.getId() == MobId.JULIET) { //juliet break;
case MobId.JULIET: //juliet
map.broadcastMessage(PacketCreator.serverNotice(6, "Juliet has fainted in the middle of the combat.")); map.broadcastMessage(PacketCreator.serverNotice(6, "Juliet has fainted in the middle of the combat."));
} else if (monster.getId() == MobId.ROMEO) { //romeo break;
case MobId.ROMEO: //romeo
map.broadcastMessage(PacketCreator.serverNotice(6, "Romeo has fainted in the middle of the combat.")); map.broadcastMessage(PacketCreator.serverNotice(6, "Romeo has fainted in the middle of the combat."));
} else if (monster.getId() == MobId.GIANT_SNOWMAN_LV1_EASY || monster.getId() == MobId.GIANT_SNOWMAN_LV1_MEDIUM || monster.getId() == MobId.GIANT_SNOWMAN_LV1_HARD) { break;
case MobId.GIANT_SNOWMAN_LV1_EASY, MobId.GIANT_SNOWMAN_LV1_MEDIUM, MobId.GIANT_SNOWMAN_LV1_HARD:
map.broadcastMessage(PacketCreator.serverNotice(6, "The Snowman has melted on the heat of the battle.")); map.broadcastMessage(PacketCreator.serverNotice(6, "The Snowman has melted on the heat of the battle."));
} else if (monster.getId() == MobId.DELLI) { //delli break;
case MobId.DELLI: //delli
map.broadcastMessage(PacketCreator.serverNotice(6, "Delli vanished after the ambush, sheets still laying on the ground...")); map.broadcastMessage(PacketCreator.serverNotice(6, "Delli vanished after the ambush, sheets still laying on the ground..."));
break;
} }
map.killFriendlies(monster); map.killFriendlies(monster);

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

@@ -38,27 +38,38 @@ public final class NPCShopHandler extends AbstractPacketHandler {
@Override @Override
public void handlePacket(InPacket p, Client c) { public void handlePacket(InPacket p, Client c) {
byte bmode = p.readByte(); byte bmode = p.readByte();
if (bmode == 0) { // mode 0 = buy :) switch (bmode) {
case 0: { // mode 0 = buy :)
short slot = p.readShort();// slot short slot = p.readShort();// slot
int itemId = p.readInt(); int itemId = p.readInt();
short quantity = p.readShort(); short quantity = p.readShort();
if (quantity < 1) { if (quantity < 1) {
AutobanFactory.PACKET_EDIT.alert(c.getPlayer(), c.getPlayer().getName() + " tried to packet edit a npc shop."); AutobanFactory.PACKET_EDIT.alert(c.getPlayer(),
c.getPlayer().getName() + " tried to packet edit a npc shop.");
log.warn("Chr {} tried to buy quantity {} of itemid {}", c.getPlayer().getName(), quantity, itemId); log.warn("Chr {} tried to buy quantity {} of itemid {}", c.getPlayer().getName(), quantity, itemId);
c.disconnect(true, false); c.disconnect(true, false);
return; return;
} }
c.getPlayer().getShop().buy(c, slot, itemId, quantity); c.getPlayer().getShop().buy(c, slot, itemId, quantity);
} else if (bmode == 1) { // sell ;) break;
}
case 1: { // sell ;)
short slot = p.readShort(); short slot = p.readShort();
int itemId = p.readInt(); int itemId = p.readInt();
short quantity = p.readShort(); short quantity = p.readShort();
c.getPlayer().getShop().sell(c, ItemConstants.getInventoryType(itemId), slot, quantity); c.getPlayer().getShop().sell(c, ItemConstants.getInventoryType(itemId), slot, quantity);
} else if (bmode == 2) { // recharge ;) break;
}
case 2: { // recharge ;)
byte slot = (byte) p.readShort(); byte slot = (byte) p.readShort();
c.getPlayer().getShop().recharge(c, slot); c.getPlayer().getShop().recharge(c, slot);
} else if (bmode == 3) { // leaving :( break;
}
case 3: // leaving :(
c.getPlayer().setShop(null); c.getPlayer().setShop(null);
} break;
}
} }
} }

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

@@ -87,8 +87,7 @@ public final class NPCTalkHandler extends AbstractPacketHandler {
} }
} }
} }
} else if (obj instanceof PlayerNPC) { } else if (obj instanceof PlayerNPC pnpc) {
PlayerNPC pnpc = (PlayerNPC) obj;
NPCScriptManager nsm = NPCScriptManager.getInstance(); NPCScriptManager nsm = NPCScriptManager.getInstance();
if (pnpc.getScriptId() < NpcId.CUSTOM_DEV && !nsm.isNpcScriptAvailable(c, "" + pnpc.getScriptId())) { if (pnpc.getScriptId() < NpcId.CUSTOM_DEV && !nsm.isNpcScriptAvailable(c, "" + pnpc.getScriptId())) {

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

@@ -291,11 +291,10 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
MapObject ob = chr.getMap().getMapObject(oid); MapObject ob = chr.getMap().getMapObject(oid);
if (ob instanceof PlayerShop shop) { if (ob instanceof PlayerShop shop) {
shop.visitShop(chr); shop.visitShop(chr);
} else if (ob instanceof MiniGame) { } else if (ob instanceof MiniGame game) {
p.skip(1); p.skip(1);
String pw = p.available() > 1 ? p.readString() : ""; String pw = p.available() > 1 ? p.readString() : "";
MiniGame game = (MiniGame) ob;
if (game.checkPassword(pw)) { if (game.checkPassword(pw)) {
if (game.hasFreeSlot() && !game.isVisitor(chr)) { if (game.hasFreeSlot() && !game.isVisitor(chr)) {
game.addVisitor(chr); game.addVisitor(chr);
@@ -849,8 +848,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
private static boolean canPlaceStore(Character chr) { private static boolean canPlaceStore(Character chr) {
try { try {
for (MapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapObjectType.HIRED_MERCHANT, MapObjectType.PLAYER))) { for (MapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapObjectType.HIRED_MERCHANT, MapObjectType.PLAYER))) {
if (mmo instanceof Character) { if (mmo instanceof Character mc) {
Character mc = (Character) mmo;
if (mc.getId() == chr.getId()) { if (mc.getId() == chr.getId()) {
continue; continue;
} }

27
src/main/java/net/server/channel/handlers/QuestActionHandler.java
View File

@@ -73,25 +73,27 @@ public final class QuestActionHandler extends AbstractPacketHandler {
Character player = c.getPlayer(); Character player = c.getPlayer();
Quest quest = Quest.getInstance(questid); Quest quest = Quest.getInstance(questid);
if (action == 0) { // Restore lost item, Credits Darter ( Rajan ) switch (action) {
case 0: // Restore lost item, Credits Darter ( Rajan )
p.readInt(); p.readInt();
int itemid = p.readInt(); int itemid = p.readInt();
quest.restoreLostItem(player, itemid); quest.restoreLostItem(player, itemid);
} else if (action == 1) { //Start Quest break;
case 1: { // Start Quest
int npc = p.readInt(); int npc = p.readInt();
if (!isNpcNearby(p, player, quest, npc)) { if (!isNpcNearby(p, player, quest, npc)) {
return; return;
} }
if (quest.canStart(player, npc)) { if (quest.canStart(player, npc)) {
quest.start(player, npc); quest.start(player, npc);
} }
} else if (action == 2) { // Complete Quest break;
}
case 2: { // Complete Quest
int npc = p.readInt(); int npc = p.readInt();
if (!isNpcNearby(p, player, quest, npc)) { if (!isNpcNearby(p, player, quest, npc)) {
return; return;
} }
if (quest.canComplete(player, npc)) { if (quest.canComplete(player, npc)) {
if (p.available() >= 2) { if (p.available() >= 2) {
int selection = p.readShort(); int selection = p.readShort();
@@ -100,26 +102,31 @@ public final class QuestActionHandler extends AbstractPacketHandler {
quest.complete(player, npc); quest.complete(player, npc);
} }
} }
} else if (action == 3) {// forfeit quest break;
}
case 3: // forfeit quest
quest.forfeit(player); quest.forfeit(player);
} else if (action == 4) { // scripted start quest break;
case 4: { // scripted start quest
int npc = p.readInt(); int npc = p.readInt();
if (!isNpcNearby(p, player, quest, npc)) { if (!isNpcNearby(p, player, quest, npc)) {
return; return;
} }
if (quest.canStart(player, npc)) { if (quest.canStart(player, npc)) {
QuestScriptManager.getInstance().start(c, questid, npc); QuestScriptManager.getInstance().start(c, questid, npc);
} }
} else if (action == 5) { // scripted end quests break;
}
case 5: { // scripted end quests
int npc = p.readInt(); int npc = p.readInt();
if (!isNpcNearby(p, player, quest, npc)) { if (!isNpcNearby(p, player, quest, npc)) {
return; return;
} }
if (quest.canComplete(player, npc)) { if (quest.canComplete(player, npc)) {
QuestScriptManager.getInstance().end(c, questid, npc); QuestScriptManager.getInstance().end(c, questid, npc);
} }
break;
}
} }
} }
} }

7
src/main/java/net/server/guild/Guild.java
View File

@@ -604,12 +604,11 @@ public class Guild {
@Override @Override
public boolean equals(Object other) { public boolean equals(Object other) {
if (!(other instanceof GuildCharacter)) { if (other instanceof GuildCharacter o) {
return false;
}
GuildCharacter o = (GuildCharacter) other;
return (o.getId() == id && o.getName().equals(name)); return (o.getId() == id && o.getName().equals(name));
} }
return false;
}
@Override @Override
public int hashCode() { public int hashCode() {

7
src/main/java/net/server/guild/GuildCharacter.java
View File

@@ -150,12 +150,11 @@ public class GuildCharacter {
@Override @Override
public boolean equals(Object other) { public boolean equals(Object other) {
if (!(other instanceof GuildCharacter)) { if (other instanceof GuildCharacter o) {
return false;
}
GuildCharacter o = (GuildCharacter) other;
return (o.getId() == id && o.getName().equals(name)); return (o.getId() == id && o.getName().equals(name));
} }
return false;
}
@Override @Override
public int hashCode() { public int hashCode() {

12
src/main/java/net/server/handlers/login/CreateCharHandler.java
View File

@@ -86,13 +86,17 @@ public final class CreateCharHandler extends AbstractPacketHandler {
} }
int status; int status;
if (job == 0) { // Knights of Cygnus switch (job) {
case 0: // Knights of Cygnus
status = NoblesseCreator.createCharacter(c, name, face, hair + haircolor, skincolor, top, bottom, shoes, weapon, gender); status = NoblesseCreator.createCharacter(c, name, face, hair + haircolor, skincolor, top, bottom, shoes, weapon, gender);
} else if (job == 1) { // Adventurer break;
case 1: // Adventurer
status = BeginnerCreator.createCharacter(c, name, face, hair + haircolor, skincolor, top, bottom, shoes, weapon, gender); status = BeginnerCreator.createCharacter(c, name, face, hair + haircolor, skincolor, top, bottom, shoes, weapon, gender);
} else if (job == 2) { // Aran break;
case 2: // Aran
status = LegendCreator.createCharacter(c, name, face, hair + haircolor, skincolor, top, bottom, shoes, weapon, gender); status = LegendCreator.createCharacter(c, name, face, hair + haircolor, skincolor, top, bottom, shoes, weapon, gender);
} else { break;
default:
c.sendPacket(PacketCreator.deleteCharResponse(0, 9)); c.sendPacket(PacketCreator.deleteCharResponse(0, 9));
return; return;
} }

1
src/main/java/provider/DataProviderFactory.java
View File

@@ -24,7 +24,6 @@ package provider;
import provider.wz.WZFiles; import provider.wz.WZFiles;
import provider.wz.XMLWZFile; import provider.wz.XMLWZFile;
import java.io.File;
import java.nio.file.Path; import java.nio.file.Path;
public class DataProviderFactory { public class DataProviderFactory {

4
src/main/java/provider/wz/WZFiles.java
View File

@@ -1,6 +1,6 @@
package provider.wz; package provider.wz;
import java.io.File; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@@ -38,7 +38,7 @@ public enum WZFiles {
private static String getWzDirectory() { private static String getWzDirectory() {
// Either provide a custom directory path through the "wz-path" property when launching the .jar, or don't provide one to use the default "wz" directory // Either provide a custom directory path through the "wz-path" property when launching the .jar, or don't provide one to use the default "wz" directory
String propertyPath = System.getProperty("wz-path"); String propertyPath = System.getProperty("wz-path");
if (propertyPath != null && new File(propertyPath).isDirectory()) { if (propertyPath != null && Files.isDirectory(Paths.get(propertyPath))) {
return propertyPath; return propertyPath;
} }

1
src/main/java/provider/wz/XMLDomMapleData.java
View File

@@ -34,7 +34,6 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import java.awt.*; import java.awt.*;
import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;

16
src/main/java/scripting/AbstractScriptManager.java
View File

@@ -28,9 +28,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.script.*; import javax.script.*;
import java.io.File;
import java.io.FileReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
/** /**
* @author Matze * @author Matze
@@ -44,9 +47,8 @@ public abstract class AbstractScriptManager {
} }
protected ScriptEngine getInvocableScriptEngine(String path) { protected ScriptEngine getInvocableScriptEngine(String path) {
path = "scripts/" + path; Path scriptFile = Paths.get("scripts").resolve(path);
File scriptFile = new File(path); if (!Files.exists(scriptFile)) {
if (!scriptFile.exists()) {
return null; return null;
} }
@@ -57,8 +59,8 @@ public abstract class AbstractScriptManager {
enableScriptHostAccess(graalScriptEngine); enableScriptHostAccess(graalScriptEngine);
try (FileReader fr = new FileReader(scriptFile, CharsetConstants.CHARSET)) { try (BufferedReader br = Files.newBufferedReader(scriptFile, CharsetConstants.CHARSET)) {
engine.eval(fr); engine.eval(br);
} catch (final ScriptException | IOException t) { } catch (final ScriptException | IOException t) {
log.warn("Exception during script eval for file: {}", path, t); log.warn("Exception during script eval for file: {}", path, t);
return null; return null;

21
src/main/java/scripting/map/MapScriptMethods.java
View File

@@ -72,21 +72,22 @@ public class MapScriptMethods extends AbstractPlayerInteraction {
} }
public void startExplorerExperience() { public void startExplorerExperience() {
if (c.getPlayer().getMapId() == 1020100) //Swordman switch (c.getPlayer().getMapId()) {
{ case 1020100: //Swordman
c.sendPacket(PacketCreator.showIntro("Effect/Direction3.img/swordman/Scene" + c.getPlayer().getGender())); c.sendPacket(PacketCreator.showIntro("Effect/Direction3.img/swordman/Scene" + c.getPlayer().getGender()));
} else if (c.getPlayer().getMapId() == 1020200) //Magician break;
{ case 1020200: //Magician
c.sendPacket(PacketCreator.showIntro("Effect/Direction3.img/magician/Scene" + c.getPlayer().getGender())); c.sendPacket(PacketCreator.showIntro("Effect/Direction3.img/magician/Scene" + c.getPlayer().getGender()));
} else if (c.getPlayer().getMapId() == 1020300) //Archer break;
{ case 1020300: //Archer
c.sendPacket(PacketCreator.showIntro("Effect/Direction3.img/archer/Scene" + c.getPlayer().getGender())); c.sendPacket(PacketCreator.showIntro("Effect/Direction3.img/archer/Scene" + c.getPlayer().getGender()));
} else if (c.getPlayer().getMapId() == 1020400) //Rogue break;
{ case 1020400: //Rogue
c.sendPacket(PacketCreator.showIntro("Effect/Direction3.img/rogue/Scene" + c.getPlayer().getGender())); c.sendPacket(PacketCreator.showIntro("Effect/Direction3.img/rogue/Scene" + c.getPlayer().getGender()));
} else if (c.getPlayer().getMapId() == 1020500) //Pirate break;
{ case 1020500: //Pirate
c.sendPacket(PacketCreator.showIntro("Effect/Direction3.img/pirate/Scene" + c.getPlayer().getGender())); c.sendPacket(PacketCreator.showIntro("Effect/Direction3.img/pirate/Scene" + c.getPlayer().getGender()));
break;
} }
} }

20
src/main/java/server/CashShop.java
View File

@@ -104,16 +104,20 @@ public class CashShop {
if (ItemConstants.EXPIRING_ITEMS) { if (ItemConstants.EXPIRING_ITEMS) {
if (period == 1) { if (period == 1) {
if (itemId == ItemId.EXP_COUPON_2X_4H || itemId == ItemId.DROP_COUPON_2X_4H) { // 4 Hour 2X coupons, the period is 1, but we don't want them to last a day. switch (itemId) {
case ItemId.DROP_COUPON_2X_4H, ItemId.EXP_COUPON_2X_4H: // 4 Hour 2X coupons, the period is 1, but we don't want them to last a day.
item.setExpiration(Server.getInstance().getCurrentTime() + HOURS.toMillis(4)); item.setExpiration(Server.getInstance().getCurrentTime() + HOURS.toMillis(4));
/* /*
} else if(itemId == 5211047 || itemId == 5360014) { // 3 Hour 2X coupons, unused as of now } else if(itemId == 5211047 || itemId == 5360014) { // 3 Hour 2X coupons, unused as of now
item.setExpiration(Server.getInstance().getCurrentTime() + HOURS.toMillis(3)); item.setExpiration(Server.getInstance().getCurrentTime() + HOURS.toMillis(3));
*/ */
} else if (itemId == ItemId.EXP_COUPON_3X_2H) { // 2 Hour 3X coupons. break;
case ItemId.EXP_COUPON_3X_2H:
item.setExpiration(Server.getInstance().getCurrentTime() + HOURS.toMillis(2)); item.setExpiration(Server.getInstance().getCurrentTime() + HOURS.toMillis(2));
} else { break;
default:
item.setExpiration(Server.getInstance().getCurrentTime() + DAYS.toMillis(1)); item.setExpiration(Server.getInstance().getCurrentTime() + DAYS.toMillis(1));
break;
} }
} else { } else {
item.setExpiration(Server.getInstance().getCurrentTime() + DAYS.toMillis(period)); item.setExpiration(Server.getInstance().getCurrentTime() + DAYS.toMillis(period));
@@ -264,12 +268,16 @@ public class CashShop {
this.characterId = characterId; this.characterId = characterId;
if (!YamlConfig.config.server.USE_JOINT_CASHSHOP_INVENTORY) { if (!YamlConfig.config.server.USE_JOINT_CASHSHOP_INVENTORY) {
if (jobType == 0) { switch (jobType) {
case 0:
factory = ItemFactory.CASH_EXPLORER; factory = ItemFactory.CASH_EXPLORER;
} else if (jobType == 1) { break;
case 1:
factory = ItemFactory.CASH_CYGNUS; factory = ItemFactory.CASH_CYGNUS;
} else if (jobType == 2) { break;
case 2:
factory = ItemFactory.CASH_ARAN; factory = ItemFactory.CASH_ARAN;
break;
} }
} else { } else {
factory = ItemFactory.CASH_OVERALL; factory = ItemFactory.CASH_OVERALL;

3
src/main/java/server/ItemInformationProvider.java
View File

@@ -1033,8 +1033,7 @@ public class ItemInformationProvider {
public Item scrollEquipWithId(Item equip, int scrollId, boolean usingWhiteScroll, int vegaItemId, boolean isGM) { public Item scrollEquipWithId(Item equip, int scrollId, boolean usingWhiteScroll, int vegaItemId, boolean isGM) {
boolean assertGM = (isGM && YamlConfig.config.server.USE_PERFECT_GM_SCROLL); boolean assertGM = (isGM && YamlConfig.config.server.USE_PERFECT_GM_SCROLL);
if (equip instanceof Equip) { if (equip instanceof Equip nEquip) {
Equip nEquip = (Equip) equip;
Map<String, Integer> stats = this.getEquipStats(scrollId); Map<String, Integer> stats = this.getEquipStats(scrollId);
if (((nEquip.getUpgradeSlots() > 0 || ItemConstants.isCleanSlate(scrollId))) || assertGM) { if (((nEquip.getUpgradeSlots() > 0 || ItemConstants.isCleanSlate(scrollId))) || assertGM) {

3
src/main/java/server/SkillbookInformationProvider.java
View File

@@ -26,12 +26,9 @@ import provider.Data;
import provider.DataProvider; import provider.DataProvider;
import provider.DataProviderFactory; import provider.DataProviderFactory;
import provider.DataTool; import provider.DataTool;
import provider.wz.WZDirectoryEntry;
import provider.wz.WZFileEntry;
import provider.wz.WZFiles; import provider.wz.WZFiles;
import tools.DatabaseConnection; import tools.DatabaseConnection;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.DirectoryStream; import java.nio.file.DirectoryStream;
import java.nio.file.Files; import java.nio.file.Files;

10
src/main/java/server/events/gm/Snowball.java
View File

@@ -128,12 +128,16 @@ public class Snowball {
if (this.hits == 0) { if (this.hits == 0) {
this.position += 1; this.position += 1;
if (this.position == 45) { switch (this.position) {
case 45:
map.getSnowball(team == 0 ? 1 : 0).message(1); map.getSnowball(team == 0 ? 1 : 0).message(1);
} else if (this.position == 290) { break;
case 290:
map.getSnowball(team == 0 ? 1 : 0).message(2); map.getSnowball(team == 0 ? 1 : 0).message(2);
} else if (this.position == 560) { break;
case 560:
map.getSnowball(team == 0 ? 1 : 0).message(3); map.getSnowball(team == 0 ? 1 : 0).message(3);
break;
} }
this.hits = 3; this.hits = 3;

10
src/main/java/server/gachapon/GachaponItems.java
View File

@@ -43,14 +43,16 @@ public abstract class GachaponItems {
} }
public final int[] getItems(int tier) { public final int[] getItems(int tier) {
if (tier == 0) { switch (tier) {
case 0:
return commonItems; return commonItems;
} else if (tier == 1) { case 1:
return uncommonItems; return uncommonItems;
} else if (tier == 2) { case 2:
return rareItems; return rareItems;
} default:
return null; return null;
} }
} }
}

3
src/main/java/server/maps/MapFactory.java
View File

@@ -112,8 +112,7 @@ public class MapFactory {
private static void loadLifeRaw(MapleMap map, int id, String type, int cy, int f, int fh, int rx0, int rx1, int x, int y, int hide, int mobTime, int team) { private static void loadLifeRaw(MapleMap map, int id, String type, int cy, int f, int fh, int rx0, int rx1, int x, int y, int hide, int mobTime, int team) {
AbstractLoadedLife myLife = loadLife(id, type, cy, f, fh, rx0, rx1, x, y, hide); AbstractLoadedLife myLife = loadLife(id, type, cy, f, fh, rx0, rx1, x, y, hide);
if (myLife instanceof Monster) { if (myLife instanceof Monster monster) {
Monster monster = (Monster) myLife;
if (mobTime == -1) { //does not respawn, force spawn once if (mobTime == -1) { //does not respawn, force spawn once
map.spawnMonster(monster); map.spawnMonster(monster);

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

@@ -1650,8 +1650,7 @@ public class MapleMap {
objectRLock.lock(); objectRLock.lock();
try { try {
for (Object ob : list) { for (Object ob : list) {
if (ob instanceof MapObject) { if (ob instanceof MapObject mmo) {
MapObject mmo = (MapObject) ob;
if (mapobjects.containsValue(mmo) && mmo.getType() == MapObjectType.REACTOR) { if (mapobjects.containsValue(mmo) && mmo.getType() == MapObjectType.REACTOR) {
listObjects.add(mmo); listObjects.add(mmo);

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

@@ -249,16 +249,14 @@ public class AriantColiseum {
} }
private ExpeditionType getExpeditionType() { private ExpeditionType getExpeditionType() {
ExpeditionType type; switch (map.getId()) {
if (map.getId() == MapId.ARPQ_ARENA_1) { case MapId.ARPQ_ARENA_1:
type = ExpeditionType.ARIANT; return ExpeditionType.ARIANT;
} else if (map.getId() == MapId.ARPQ_ARENA_2) { case MapId.ARPQ_ARENA_2:
type = ExpeditionType.ARIANT1; return ExpeditionType.ARIANT1;
} else { default:
type = ExpeditionType.ARIANT2; return ExpeditionType.ARIANT2;
} }
return type;
} }
private void enterKingsRoom() { private void enterKingsRoom() {

39
src/main/java/server/partyquest/PartyQuest.java
View File

@@ -70,48 +70,47 @@ public class PartyQuest {
synchronized (participants) { synchronized (participants) {
participants.remove(chr); participants.remove(chr);
chr.setPartyQuest(null); chr.setPartyQuest(null);
if (participants.isEmpty()) {
super.finalize();
}
//System.gc(); //System.gc();
} }
} }
public static int getExp(String PQ, int level) { public static int getExp(String PQ, int level) {
if (PQ.equals("HenesysPQ")) { switch (PQ) {
case "HenesysPQ":
return 1250 * level / 5; return 1250 * level / 5;
} else if (PQ.equals("KerningPQFinal")) { case "KerningPQFinal":
return 500 * level / 5; return 500 * level / 5;
} else if (PQ.equals("KerningPQ4th")) { case "KerningPQ4th":
return 400 * level / 5; return 400 * level / 5;
} else if (PQ.equals("KerningPQ3rd")) { case "KerningPQ3rd":
return 300 * level / 5; return 300 * level / 5;
} else if (PQ.equals("KerningPQ2nd")) { case "KerningPQ2nd":
return 200 * level / 5; return 200 * level / 5;
} else if (PQ.equals("KerningPQ1st")) { case "KerningPQ1st":
return 100 * level / 5; return 100 * level / 5;
} else if (PQ.equals("LudiMazePQ")) { case "LudiMazePQ":
return 2000 * level / 5; return 2000 * level / 5;
} else if (PQ.equals("LudiPQ1st")) { case "LudiPQ1st":
return 100 * level / 5; return 100 * level / 5;
} else if (PQ.equals("LudiPQ2nd")) { case "LudiPQ2nd":
return 250 * level / 5; return 250 * level / 5;
} else if (PQ.equals("LudiPQ3rd")) { case "LudiPQ3rd":
return 350 * level / 5; return 350 * level / 5;
} else if (PQ.equals("LudiPQ4th")) { case "LudiPQ4th":
return 350 * level / 5; return 350 * level / 5;
} else if (PQ.equals("LudiPQ5th")) { case "LudiPQ5th":
return 400 * level / 5; return 400 * level / 5;
} else if (PQ.equals("LudiPQ6th")) { case "LudiPQ6th":
return 450 * level / 5; return 450 * level / 5;
} else if (PQ.equals("LudiPQ7th")) { case "LudiPQ7th":
return 500 * level / 5; return 500 * level / 5;
} else if (PQ.equals("LudiPQ8th")) { case "LudiPQ8th":
return 650 * level / 5; return 650 * level / 5;
} else if (PQ.equals("LudiPQLast")) { case "LudiPQLast":
return 800 * level / 5; return 800 * level / 5;
} default:
log.warn("Unhandled PartyQuest: {}", PQ); log.warn("Unhandled PartyQuest: {}", PQ);
return 0; return 0;
} }
} }
}

7
src/main/java/server/quest/Quest.java
View File

@@ -111,12 +111,15 @@ public class Quest {
if (startReqData != null) { if (startReqData != null) {
for (Data startReq : startReqData.getChildren()) { for (Data startReq : startReqData.getChildren()) {
QuestRequirementType type = QuestRequirementType.getByWZName(startReq.getName()); QuestRequirementType type = QuestRequirementType.getByWZName(startReq.getName());
if (type.equals(QuestRequirementType.INTERVAL)) { switch (type) {
case INTERVAL:
repeatable = true; repeatable = true;
} else if (type.equals(QuestRequirementType.MOB)) { break;
case MOB:
for (Data mob : startReq.getChildren()) { for (Data mob : startReq.getChildren()) {
relevantMobs.add(DataTool.getInt(mob.getChildByPath("id"))); relevantMobs.add(DataTool.getInt(mob.getChildByPath("id")));
} }
break;
} }
AbstractQuestRequirement req = this.getRequirement(type, startReq); AbstractQuestRequirement req = this.getRequirement(type, startReq);

37
src/main/java/server/quest/QuestActionType.java
View File

@@ -52,41 +52,42 @@ public enum QuestActionType {
} }
public static QuestActionType getByWZName(String name) { public static QuestActionType getByWZName(String name) {
if (name.equals("exp")) { switch (name) {
case "exp":
return EXP; return EXP;
} else if (name.equals("money")) { case "money":
return MESO; return MESO;
} else if (name.equals("item")) { case "item":
return ITEM; return ITEM;
} else if (name.equals("skill")) { case "skill":
return SKILL; return SKILL;
} else if (name.equals("nextQuest")) { case "nextQuest":
return NEXTQUEST; return NEXTQUEST;
} else if (name.equals("pop")) { case "pop":
return FAME; return FAME;
} else if (name.equals("buffItemID")) { case "buffItemID":
return BUFF; return BUFF;
} else if (name.equals("petskill")) { case "petskill":
return PETSKILL; return PETSKILL;
} else if (name.equals("no")) { case "no":
return NO; return NO;
} else if (name.equals("yes")) { case "yes":
return YES; return YES;
} else if (name.equals("npc")) { case "npc":
return NPC; return NPC;
} else if (name.equals("lvmin")) { case "lvmin":
return MIN_LEVEL; return MIN_LEVEL;
} else if (name.equals("normalAutoStart")) { case "normalAutoStart":
return NORMAL_AUTO_START; return NORMAL_AUTO_START;
} else if (name.equals("pettameness")) { case "pettameness":
return PETTAMENESS; return PETTAMENESS;
} else if (name.equals("petspeed")) { case "petspeed":
return PETSPEED; return PETSPEED;
} else if (name.equals("info")) { case "info":
return INFO; return INFO;
} else if (name.equals("0")) { case "0":
return ZERO; return ZERO;
} else { default:
return UNDEFINED; return UNDEFINED;
} }
} }

53
src/main/java/server/quest/QuestRequirementType.java
View File

@@ -62,57 +62,58 @@ public enum QuestRequirementType {
} }
public static QuestRequirementType getByWZName(String name) { public static QuestRequirementType getByWZName(String name) {
if (name.equals("job")) { switch (name) {
case "job":
return JOB; return JOB;
} else if (name.equals("quest")) { case "quest":
return QUEST; return QUEST;
} else if (name.equals("item")) { case "item":
return ITEM; return ITEM;
} else if (name.equals("lvmin")) { case "lvmin":
return MIN_LEVEL; return MIN_LEVEL;
} else if (name.equals("lvmax")) { case "lvmax":
return MAX_LEVEL; return MAX_LEVEL;
} else if (name.equals("end")) { case "end":
return END_DATE; return END_DATE;
} else if (name.equals("mob")) { case "mob":
return MOB; return MOB;
} else if (name.equals("npc")) { case "npc":
return NPC; return NPC;
} else if (name.equals("fieldEnter")) { case "fieldEnter":
return FIELD_ENTER; return FIELD_ENTER;
} else if (name.equals("interval")) { case "interval":
return INTERVAL; return INTERVAL;
} else if (name.equals("startscript")) { case "startscript":
return SCRIPT; return SCRIPT;
} else if (name.equals("endscript")) { case "endscript":
return SCRIPT; return SCRIPT;
} else if (name.equals("pet")) { case "pet":
return PET; return PET;
} else if (name.equals("pettamenessmin")) { case "pettamenessmin":
return MIN_PET_TAMENESS; return MIN_PET_TAMENESS;
} else if (name.equals("mbmin")) { case "mbmin":
return MONSTER_BOOK; return MONSTER_BOOK;
} else if (name.equals("normalAutoStart")) { case "normalAutoStart":
return NORMAL_AUTO_START; return NORMAL_AUTO_START;
} else if (name.equals("infoNumber")) { case "infoNumber":
return INFO_NUMBER; return INFO_NUMBER;
} else if (name.equals("infoex")) { case "infoex":
return INFO_EX; return INFO_EX;
} else if (name.equals("questComplete")) { case "questComplete":
return COMPLETED_QUEST; return COMPLETED_QUEST;
} else if (name.equals("start")) { case "start":
return START; return START;
/*} else if(name.equals("end")) { already coded /* case "end":already coded
return END;*/ return END;*/
} else if (name.equals("daybyday")) { case "daybyday":
return DAY_BY_DAY; return DAY_BY_DAY;
} else if (name.equals("money")) { case "money":
return MESO; return MESO;
} else if (name.equals("buff")) { case "buff":
return BUFF; return BUFF;
} else if (name.equals("exceptbuff")) { case "exceptbuff":
return EXCEPT_BUFF; return EXCEPT_BUFF;
} else { default:
return UNDEFINED; return UNDEFINED;
} }
} }

7
src/main/java/tools/ArrayMap.java
View File

@@ -53,12 +53,11 @@ public class ArrayMap<K, V> extends AbstractMap<K, V> {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof Map.Entry<?, ?>)) { if (o instanceof Map.Entry<?, ?> e) {
return false;
}
Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
return (key == null ? e.getKey() == null : key.equals(e.getKey())) && (value == null ? e.getValue() == null : value.equals(e.getValue())); return (key == null ? e.getKey() == null : key.equals(e.getKey())) && (value == null ? e.getValue() == null : value.equals(e.getValue()));
} }
return false;
}
@Override @Override
public int hashCode() { public int hashCode() {

1
src/main/java/tools/mapletools/MobBookIndexer.java
View File

@@ -3,7 +3,6 @@ package tools.mapletools;
import provider.wz.WZFiles; import provider.wz.WZFiles;
import java.io.*; import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.sql.Connection; import java.sql.Connection;