Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-10 18:33:20 +08:00
Code Issues Projects Releases Wiki Activity

Move gadget/monster creation events to after they are spawned in scene

Browse Source
This commit is contained in:
Melledy 2022-05-19 00:36:38 -07:00
parent 512021b234
commit cd77fb90a3
5 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/emu/grasscutter/game/entity/EntityGadget.java
View File

@ -28,6 +28,8 @@ import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
import emu.grasscutter.net.proto.VectorOuterClass.Vector;
import emu.grasscutter.net.proto.WorktopInfoOuterClass.WorktopInfo;
import emu.grasscutter.scripts.constants.EventType;
import emu.grasscutter.scripts.data.ScriptArgs;
import emu.grasscutter.server.packet.send.PacketGadgetStateNotify;
import emu.grasscutter.utils.Position;
import emu.grasscutter.utils.ProtoHelper;
@ -139,6 +141,12 @@ public class EntityGadget extends EntityBaseGadget {
return null;
}
@Override
public void onCreate() {
// Lua event
getScene().getScriptManager().callEvent(EventType.EVENT_GADGET_CREATE, new ScriptArgs(this.getConfigId()));
}
@Override
public void onDeath(int killerId) {

6
src/main/java/emu/grasscutter/game/entity/EntityMonster.java
View File

@ -110,6 +110,12 @@ public class EntityMonster extends GameEntity {
this.poseId = poseId;
}
@Override
public void onCreate() {
// Lua event
getScene().getScriptManager().callEvent(EventType.EVENT_ANY_MONSTER_LIVE, new ScriptArgs(this.getConfigId()));
}
@Override
public void onDeath(int killerId) {
if (this.getSpawnEntry() != null) {

21
src/main/java/emu/grasscutter/game/entity/GameEntity.java
View File

@ -108,10 +108,6 @@ public abstract class GameEntity {
this.lastMoveReliableSeq = lastMoveReliableSeq;
}
public abstract SceneEntityInfo toProto();
public abstract void onDeath(int killerId);
public void setFightProperty(FightProperty prop, float value) {
this.getFightProperties().put(prop.getId(), value);
}
@ -219,4 +215,21 @@ public abstract class GameEntity {
getScene().killEntity(this, 0);
}
}
/**
* Called when this entity is added to the world
*/
public void onCreate() {
}
/**
* Called when this entity dies
* @param killerId Entity id of the entity that killed this entity
*/
public void onDeath(int killerId) {
}
public abstract SceneEntityInfo toProto();
}

1
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@ -311,6 +311,7 @@ public class Scene {
private void addEntityDirectly(GameEntity entity) {
getEntities().put(entity.getId(), entity);
entity.onCreate(); // Call entity create event
}
public synchronized void addEntity(GameEntity entity) {

3
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
View File

@ -371,9 +371,6 @@ public class SceneScriptManager {
this.getScriptMonsterSpawnService()
.onMonsterCreatedListener.forEach(action -> action.onNotify(entity));
// Lua event
callEvent(EventType.EVENT_ANY_MONSTER_LIVE, new ScriptArgs(entity.getConfigId()));
return entity;
}