diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java index 543937069..e6851e6ad 100644 --- a/src/main/java/emu/grasscutter/game/player/Player.java +++ b/src/main/java/emu/grasscutter/game/player/Player.java @@ -392,7 +392,7 @@ public class Player { this.realmList.add(realmId); // Tell the client the realm is unlocked - if(realmId > 3){ // Realms 3 and below are default 'unlocked' + if (realmId > 3) { // Realms 3 and below are default 'unlocked' this.sendPacket(new PacketHomeModuleUnlockNotify(realmId)); this.getHome().onClaimReward(this); } diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseUnlockHomeModule.java b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseUnlockHomeModule.java index 7e679f36f..abcbb0da2 100644 --- a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseUnlockHomeModule.java +++ b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseUnlockHomeModule.java @@ -19,7 +19,6 @@ public class ItemUseUnlockHomeModule extends ItemUseInt { @Override public boolean postUseItem(UseItemParams params){ - params.player.addRealmList(this.i); return true; } diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBackMyWorldReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBackMyWorldReq.java index a90cab76c..1719fc897 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBackMyWorldReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBackMyWorldReq.java @@ -10,7 +10,7 @@ import emu.grasscutter.server.packet.send.PacketBackMyWorldRsp; @Opcodes(PacketOpcodes.BackMyWorldReq) public class HandlerBackMyWorldReq extends PacketHandler { - + @Override public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { @@ -18,15 +18,15 @@ public class HandlerBackMyWorldReq extends PacketHandler { int prevScene = scene.getPrevScene(); // Sanity check for switching between teapot realms - if(prevScene >= 2000 && prevScene <= 2006){ + if (prevScene >= 2000 && prevScene <= 2006) { prevScene = 3; } - + session.getPlayer().getWorld().transferPlayerToScene( - session.getPlayer(), - prevScene, - TeleportType.WAYPOINT, - session.getPlayer().getPrevPos()); + session.getPlayer(), + prevScene, + TeleportType.WAYPOINT, + session.getPlayer().getPrevPos()); session.send(new PacketBackMyWorldRsp()); } diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeModuleReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeModuleReq.java index b9834ae6c..c99593539 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeModuleReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeModuleReq.java @@ -12,7 +12,6 @@ import emu.grasscutter.server.packet.send.PacketHomeComfortInfoNotify; import emu.grasscutter.server.packet.send.PacketPlayerHomeCompInfoNotify; import emu.grasscutter.utils.Position; - @Opcodes(PacketOpcodes.HomeChangeModuleReq) public class HandlerHomeChangeModuleReq extends PacketHandler { @@ -31,8 +30,8 @@ public class HandlerHomeChangeModuleReq extends PacketHandler { Position pos = scene.getScriptManager().getConfig().born_pos; session.getPlayer().getWorld().transferPlayerToScene( - session.getPlayer(), realmId, - TeleportType.WAYPOINT, pos + session.getPlayer(), realmId, + TeleportType.WAYPOINT, pos ); } } diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java index db696347e..a852d9574 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java @@ -46,7 +46,7 @@ public class PacketPlayerEnterSceneNotify extends BasePacket { // Set previous position if(!(newScene == 3)){ // Hardcoded for now else weird positions will occur // Don't update position within same scene or teapot - }else{ + } else { // Only used for exiting teapot currently player.setPrevPos(player.getPosition()); }