diff --git a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java index ff6a343bbb..6b31e3c13b 100644 --- a/src/main/java/net/server/channel/handlers/UseCashItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseCashItemHandler.java @@ -396,7 +396,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler { c.getWorldServer().addOwlItemSearch(itemid); } player.setOwlSearch(itemid); - List> hmsAvailable = c.getWorldServer().getAvailableItemBundles(itemid); + List> hmsAvailable = c.getWorldServer().getAvailableItemBundles(itemid); if (!hmsAvailable.isEmpty()) { remove(c, position, itemId); } diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index 9a5973e4fa..b95a0ed5d3 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -1813,8 +1813,8 @@ public class World { } } - public List> getAvailableItemBundles(int itemid) { - List> hmsAvailable = new ArrayList<>(); + public List> getAvailableItemBundles(int itemid) { + List> hmsAvailable = new ArrayList<>(); for (MapleHiredMerchant hm : getActiveMerchants()) { List itemBundles = hm.sendAvailableBundles(itemid); diff --git a/src/main/java/server/life/PlayerNPC.java b/src/main/java/server/life/PlayerNPC.java index 517a8cd10b..918de2a87b 100644 --- a/src/main/java/server/life/PlayerNPC.java +++ b/src/main/java/server/life/PlayerNPC.java @@ -32,7 +32,7 @@ import net.server.channel.Channel; import net.server.world.World; import server.life.positioner.PlayerNPCPodium; import server.life.positioner.PlayerNPCPositioner; -import server.maps.AbstractMapleMapObject; +import server.maps.AbstractMapObject; import server.maps.MapleMap; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; @@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicInteger; * @author XoticStory * @author Ronan */ -public class PlayerNPC extends AbstractMapleMapObject { +public class PlayerNPC extends AbstractMapObject { private static final Map> availablePlayerNpcScriptIds = new HashMap<>(); private static final AtomicInteger runningOverallRank = new AtomicInteger(); private static final List runningWorldRank = new ArrayList<>(); diff --git a/src/main/java/server/maps/AbstractAnimatedMapObject.java b/src/main/java/server/maps/AbstractAnimatedMapObject.java index 79126a9277..82c23ff827 100644 --- a/src/main/java/server/maps/AbstractAnimatedMapObject.java +++ b/src/main/java/server/maps/AbstractAnimatedMapObject.java @@ -26,7 +26,7 @@ import net.packet.*; import java.util.Arrays; -public abstract class AbstractAnimatedMapObject extends AbstractMapleMapObject implements AnimatedMapleMapObject { +public abstract class AbstractAnimatedMapObject extends AbstractMapObject implements AnimatedMapleMapObject { public static final int IDLE_MOVEMENT_PACKET_LENGTH = 15; private static final Packet IDLE_MOVEMENT_PACKET = createIdleMovementPacket(); diff --git a/src/main/java/server/maps/AbstractMapleMapObject.java b/src/main/java/server/maps/AbstractMapObject.java similarity index 93% rename from src/main/java/server/maps/AbstractMapleMapObject.java rename to src/main/java/server/maps/AbstractMapObject.java index 24499433e6..7615a40c11 100644 --- a/src/main/java/server/maps/AbstractMapleMapObject.java +++ b/src/main/java/server/maps/AbstractMapObject.java @@ -21,9 +21,9 @@ */ package server.maps; -import java.awt.Point; +import java.awt.*; -public abstract class AbstractMapleMapObject implements MapleMapObject { +public abstract class AbstractMapObject implements MapleMapObject { private Point position = new Point(); private int objectId; @@ -49,9 +49,9 @@ public abstract class AbstractMapleMapObject implements MapleMapObject { public void setObjectId(int id) { this.objectId = id; } - + @Override public void nullifyPosition() { this.position = null; - } + } } diff --git a/src/main/java/server/maps/MapleDoorObject.java b/src/main/java/server/maps/MapleDoorObject.java index 9bf380701a..4f68ce7779 100644 --- a/src/main/java/server/maps/MapleDoorObject.java +++ b/src/main/java/server/maps/MapleDoorObject.java @@ -36,7 +36,7 @@ import java.awt.*; * * @author Ronan */ -public class MapleDoorObject extends AbstractMapleMapObject { +public class MapleDoorObject extends AbstractMapObject { private final int ownerId; private int pairOid; diff --git a/src/main/java/server/maps/MapleHiredMerchant.java b/src/main/java/server/maps/MapleHiredMerchant.java index b7223cb83e..cad0173ba5 100644 --- a/src/main/java/server/maps/MapleHiredMerchant.java +++ b/src/main/java/server/maps/MapleHiredMerchant.java @@ -57,7 +57,7 @@ import java.util.concurrent.locks.Lock; * @author XoticStory * @author Ronan - concurrency protection */ -public class MapleHiredMerchant extends AbstractMapleMapObject { +public class MapleHiredMerchant extends AbstractMapObject { private int ownerId, itemId, mesos = 0; private int channel, world; private long start; diff --git a/src/main/java/server/maps/MapleKite.java b/src/main/java/server/maps/MapleKite.java index 9c51c91215..2a7f7e2712 100644 --- a/src/main/java/server/maps/MapleKite.java +++ b/src/main/java/server/maps/MapleKite.java @@ -7,7 +7,7 @@ import tools.PacketCreator; import java.awt.*; -public class MapleKite extends AbstractMapleMapObject { +public class MapleKite extends AbstractMapObject { private final Point pos; private final Character owner; private final String text; diff --git a/src/main/java/server/maps/MapleMapItem.java b/src/main/java/server/maps/MapleMapItem.java index 028bb85118..73896c3001 100644 --- a/src/main/java/server/maps/MapleMapItem.java +++ b/src/main/java/server/maps/MapleMapItem.java @@ -30,7 +30,7 @@ import tools.PacketCreator; import java.awt.*; import java.util.concurrent.locks.Lock; -public class MapleMapItem extends AbstractMapleMapObject { +public class MapleMapItem extends AbstractMapObject { protected Client ownerClient; protected Item item; protected MapleMapObject dropper; diff --git a/src/main/java/server/maps/MapleMiniGame.java b/src/main/java/server/maps/MapleMiniGame.java index a96588ddcc..410f11fe54 100644 --- a/src/main/java/server/maps/MapleMiniGame.java +++ b/src/main/java/server/maps/MapleMiniGame.java @@ -36,7 +36,7 @@ import java.util.List; * @author Matze * @author Ronan (HeavenMS) */ -public class MapleMiniGame extends AbstractMapleMapObject { +public class MapleMiniGame extends AbstractMapObject { private Character owner; private Character visitor; private String password; diff --git a/src/main/java/server/maps/MapleMist.java b/src/main/java/server/maps/MapleMist.java index 456eb99615..cc86ae9645 100644 --- a/src/main/java/server/maps/MapleMist.java +++ b/src/main/java/server/maps/MapleMist.java @@ -38,7 +38,7 @@ import java.awt.*; * * @author LaiLaiNoob */ -public class MapleMist extends AbstractMapleMapObject { +public class MapleMist extends AbstractMapObject { private Rectangle mistPosition; private Character owner = null; private Monster mob = null; diff --git a/src/main/java/server/maps/MaplePlayerShop.java b/src/main/java/server/maps/MaplePlayerShop.java index f1561fbc4f..fbbbe48664 100644 --- a/src/main/java/server/maps/MaplePlayerShop.java +++ b/src/main/java/server/maps/MaplePlayerShop.java @@ -44,7 +44,7 @@ import java.util.concurrent.locks.Lock; * @author Matze * @author Ronan - concurrency protection */ -public class MaplePlayerShop extends AbstractMapleMapObject { +public class MaplePlayerShop extends AbstractMapObject { private AtomicBoolean open = new AtomicBoolean(false); private Character owner; private int itemid; diff --git a/src/main/java/server/maps/MapleReactor.java b/src/main/java/server/maps/MapleReactor.java index ff0fde471a..b80bc305be 100644 --- a/src/main/java/server/maps/MapleReactor.java +++ b/src/main/java/server/maps/MapleReactor.java @@ -44,7 +44,7 @@ import java.util.concurrent.locks.Lock; * @author Lerk * @author Ronan */ -public class MapleReactor extends AbstractMapleMapObject { +public class MapleReactor extends AbstractMapObject { private int rid; private MapleReactorStats stats; diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index ed5d04c1af..2037d8e6c1 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -5004,7 +5004,7 @@ public class PacketCreator { return p; } - public static Packet owlOfMinerva(Client c, int itemId, List> hmsAvailable) { + public static Packet owlOfMinerva(Client c, int itemId, List> hmsAvailable) { byte itemType = ItemConstants.getInventoryType(itemId).getType(); OutPacket p = OutPacket.create(SendOpcode.SHOP_SCANNER_RESULT); @@ -5012,9 +5012,9 @@ public class PacketCreator { p.writeInt(0); p.writeInt(itemId); p.writeInt(hmsAvailable.size()); - for (Pair hme : hmsAvailable) { + for (Pair hme : hmsAvailable) { MaplePlayerShopItem item = hme.getLeft(); - AbstractMapleMapObject mo = hme.getRight(); + AbstractMapObject mo = hme.getRight(); if (mo instanceof MaplePlayerShop ps) { Character owner = ps.getOwner();