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

Clean up code & Upgrade syntax to new Java

Browse Source
This commit is contained in:
Đạt Nhân Trương
2022-08-07 01:35:02 +07:00
parent bbdf236a10
commit f983b4dccf
17 changed files with 44 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
c.sendPacket(PacketCreator.takeFromCashInventory(item));
if (item instanceof Equip) {
Equip equip = (Equip) item;
if (item instanceof Equip equip) {
if (equip.getRingId() >= 0) {
Ring ring = Ring.loadFromDb(equip.getRingId());
chr.addPlayerRing(ring);
@@ -323,8 +322,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
return;
}*/ //Gotta let them faggots marry too, hence why this is commented out <3
if (itemRing.toItem() instanceof Equip) {
Equip eqp = (Equip) itemRing.toItem();
if (itemRing.toItem() instanceof Equip eqp) {
Pair<Integer, Integer> rings = Ring.createRing(itemRing.getItemId(), chr, partner);
eqp.setRingId(rings.getLeft());
cs.addToInventory(eqp);
@@ -387,8 +385,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.showCashShopMessage((byte) 0xBE));
} else {
// Need to check to make sure its actually an equip and the right SN...
if (itemRing.toItem() instanceof Equip) {
Equip eqp = (Equip) itemRing.toItem();
if (itemRing.toItem() instanceof Equip eqp) {
Pair<Integer, Integer> rings = Ring.createRing(itemRing.getItemId(), chr, partner);
eqp.setRingId(rings.getLeft());
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();
MapObject target = c.getPlayer().getMap().getMapObject(cid);
if (target != null) {
if (target instanceof Character) {
Character player = (Character) target;
if (target instanceof Character player) {
if (c.getPlayer().getId() != player.getId()) {
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()) {
if (obj instanceof DoorObject) {
DoorObject door = (DoorObject) obj;
if (obj instanceof DoorObject door) {
if (door.getOwnerId() == ownerid) {
door.warp(chr);
return;

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

@@ -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)) {

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) {
PlayerNPC pnpc = (PlayerNPC) obj;
} else if (obj instanceof PlayerNPC pnpc) {
NPCScriptManager nsm = NPCScriptManager.getInstance();
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);
if (ob instanceof PlayerShop shop) {
shop.visitShop(chr);
} else if (ob instanceof MiniGame) {
} else if (ob instanceof MiniGame game) {
p.skip(1);
String pw = p.available() > 1 ? p.readString() : "";
MiniGame game = (MiniGame) ob;
if (game.checkPassword(pw)) {
if (game.hasFreeSlot() && !game.isVisitor(chr)) {
game.addVisitor(chr);
@@ -849,8 +848,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
private static boolean canPlaceStore(Character chr) {
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) {
if (mc.getId() == chr.getId()) {
continue;
}

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

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

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

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