Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 20:03:21 +00:00
Code Issues Projects Releases Wiki Activity

Add PlayerEnterAreaEvent

Browse Source
This commit is contained in:
KingRainbow44 2023-05-22 02:57:59 -04:00
parent ec55b2ec22
commit d8ad10e22d
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
3 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,7 @@ import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail;
import emu.grasscutter.net.proto.SocialShowAvatarInfoOuterClass;
import emu.grasscutter.plugin.api.PlayerHook;
import emu.grasscutter.scripts.data.SceneRegion;
import emu.grasscutter.server.event.player.PlayerEnterAreaEvent;
import emu.grasscutter.server.event.player.PlayerJoinEvent;
import emu.grasscutter.server.event.player.PlayerQuitEvent;
import emu.grasscutter.server.game.GameServer;
@ -148,6 +149,8 @@ public class Player implements PlayerHook {
@Transient private Scene scene; // Synchronized getter and setter
@Transient @Getter private int weatherId = 0;
@Transient @Getter private ClimateType climate = ClimateType.CLIMATE_SUNNY;
@Transient @Getter private int areaId = 0;
@Transient @Getter private int areaType = 0;
// Player managers go here
@Getter private transient AvatarStorage avatars;
@ -420,11 +423,11 @@ public class Player implements PlayerHook {
this.session.send(new PacketSceneAreaWeatherNotify(this));
}
synchronized public void setWeather(int weather) {
public synchronized void setWeather(int weather) {
this.setWeather(weather, ClimateType.CLIMATE_NONE);
}
synchronized public void setWeather(int weatherId, ClimateType climate) {
public synchronized void setWeather(int weatherId, ClimateType climate) {
// Lookup default climate for this weather
if (climate == ClimateType.CLIMATE_NONE) {
WeatherData w = GameData.getWeatherDataMap().get(weatherId);
@ -437,6 +440,21 @@ public class Player implements PlayerHook {
this.session.send(new PacketSceneAreaWeatherNotify(this));
}
/**
* Sets the player's weather and climate.
*
* @param areaId The area ID.
* @param areaType The area type.
*/
public void setArea(int areaId, int areaType) {
this.areaId = areaId;
this.areaType = areaType;
// Call the event.
var event = new PlayerEnterAreaEvent(this);
event.call();
}
public void setNickname(String nickName) {
this.nickname = nickName;
this.updateProfile();

16
src/main/java/emu/grasscutter/server/event/player/PlayerEnterAreaEvent.java Normal file
View File

@ -0,0 +1,16 @@
package emu.grasscutter.server.event.player;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.server.event.types.PlayerEvent;
import lombok.Getter;
public final class PlayerEnterAreaEvent extends PlayerEvent {
@Getter private final int areaId, areaType;
public PlayerEnterAreaEvent(Player player) {
super(player);
this.areaId = player.getAreaId();
this.areaType = player.getAreaType();
}
}

1
src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterWorldAreaReq.java
View File

@ -16,6 +16,7 @@ public class HandlerEnterWorldAreaReq extends PacketHandler {
PacketHead head = PacketHead.parseFrom(header);
EnterWorldAreaReq enterWorld = EnterWorldAreaReq.parseFrom(payload);
session.getPlayer().setArea(enterWorld.getAreaId(), enterWorld.getAreaType());
session.send(new PacketEnterWorldAreaRsp(head.getClientSequenceId(), enterWorld));
// session.send(new PacketScenePlayerLocationNotify(session.getPlayer()));
}