Clean up code & Upgrade syntax to new Java

2022-08-07 01:35:02 +07:00
parent bbdf236a10
commit f983b4dccf
17 changed files with 44 additions and 61 deletions
--- a/src/main/java/net/server/channel/handlers/HiredMerchantRequest.java
+++ b/src/main/java/net/server/channel/handlers/HiredMerchantRequest.java
@@ -47,8 +47,7 @@ public final class HiredMerchantRequest extends AbstractPacketHandler {

        try {
            for (MapObject mmo : chr.getMap().getMapObjectsInRange(chr.getPosition(), 23000, Arrays.asList(MapObjectType.HIRED_MERCHANT, MapObjectType.PLAYER))) {
-                if (mmo instanceof Character) {
-                    Character mc = (Character) mmo;
+                if (mmo instanceof Character mc) {

                    PlayerShop shop = mc.getPlayerShop();
                    if (shop != null && shop.isOwner(mc)) {