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

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;
}