Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-02-04 17:22:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace & Formatting

Browse Source
This commit is contained in:
Thoronium
2023-01-29 13:44:16 -07:00
parent a5fa6c15a1
commit da6314116b
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/game/player/Player.java
View File

@@ -392,7 +392,7 @@ public class Player {
this.realmList.add(realmId); this.realmList.add(realmId);
// Tell the client the realm is unlocked // 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.sendPacket(new PacketHomeModuleUnlockNotify(realmId));
this.getHome().onClaimReward(this); this.getHome().onClaimReward(this);
} }

1
src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseUnlockHomeModule.java
View File

@@ -19,7 +19,6 @@ public class ItemUseUnlockHomeModule extends ItemUseInt {
@Override @Override
public boolean postUseItem(UseItemParams params){ public boolean postUseItem(UseItemParams params){
params.player.addRealmList(this.i); params.player.addRealmList(this.i);
return true; return true;
} }

14
src/main/java/emu/grasscutter/server/packet/recv/HandlerBackMyWorldReq.java
View File

@@ -10,7 +10,7 @@ import emu.grasscutter.server.packet.send.PacketBackMyWorldRsp;
@Opcodes(PacketOpcodes.BackMyWorldReq) @Opcodes(PacketOpcodes.BackMyWorldReq)
public class HandlerBackMyWorldReq extends PacketHandler { public class HandlerBackMyWorldReq extends PacketHandler {
@Override @Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
@@ -18,15 +18,15 @@ public class HandlerBackMyWorldReq extends PacketHandler {
int prevScene = scene.getPrevScene(); int prevScene = scene.getPrevScene();
// Sanity check for switching between teapot realms // Sanity check for switching between teapot realms
if(prevScene >= 2000 && prevScene <= 2006){ if (prevScene >= 2000 && prevScene <= 2006) {
prevScene = 3; prevScene = 3;
} }
session.getPlayer().getWorld().transferPlayerToScene( session.getPlayer().getWorld().transferPlayerToScene(
session.getPlayer(), session.getPlayer(),
prevScene, prevScene,
TeleportType.WAYPOINT, TeleportType.WAYPOINT,
session.getPlayer().getPrevPos()); session.getPlayer().getPrevPos());
session.send(new PacketBackMyWorldRsp()); session.send(new PacketBackMyWorldRsp());
} }

5
src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeChangeModuleReq.java
View File

@@ -12,7 +12,6 @@ import emu.grasscutter.server.packet.send.PacketHomeComfortInfoNotify;
import emu.grasscutter.server.packet.send.PacketPlayerHomeCompInfoNotify; import emu.grasscutter.server.packet.send.PacketPlayerHomeCompInfoNotify;
import emu.grasscutter.utils.Position; import emu.grasscutter.utils.Position;
@Opcodes(PacketOpcodes.HomeChangeModuleReq) @Opcodes(PacketOpcodes.HomeChangeModuleReq)
public class HandlerHomeChangeModuleReq extends PacketHandler { public class HandlerHomeChangeModuleReq extends PacketHandler {
@@ -31,8 +30,8 @@ public class HandlerHomeChangeModuleReq extends PacketHandler {
Position pos = scene.getScriptManager().getConfig().born_pos; Position pos = scene.getScriptManager().getConfig().born_pos;
session.getPlayer().getWorld().transferPlayerToScene( session.getPlayer().getWorld().transferPlayerToScene(
session.getPlayer(), realmId, session.getPlayer(), realmId,
TeleportType.WAYPOINT, pos TeleportType.WAYPOINT, pos
); );
} }
} }

2
src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java
View File

@@ -46,7 +46,7 @@ public class PacketPlayerEnterSceneNotify extends BasePacket {
// Set previous position // Set previous position
if(!(newScene == 3)){ // Hardcoded for now else weird positions will occur if(!(newScene == 3)){ // Hardcoded for now else weird positions will occur
// Don't update position within same scene or teapot // Don't update position within same scene or teapot
}else{ } else {
// Only used for exiting teapot currently // Only used for exiting teapot currently
player.setPrevPos(player.getPosition()); player.setPrevPos(player.getPosition());
} }