Fix Librarian Story Quest (#2218)

* Fix Librarian Story Quest

* People die if they are killed

You want to die people instead of remove them so they play their sweet death animations.

* Nope. I take it back. Scriptlib is the wierd one to think removeEntity removes the entity.

* One must stop editing the code directly.

* Update EntityType.java

* Add warnings per Hartie

* Per Hartie, change getEntityType to EntityType

src/main/java/emu/grasscutter/game/entity/GameEntity.java

@@ -52,8 +52,8 @@ public abstract class GameEntity {
 
     public abstract void initAbilities();
 
-    public int getEntityType() {
-        return this.getId() >> 24;
+    public EntityType getEntityType() {
+        return EntityIdType.toEntityType(this.getId() >> 24);
     }
 
     public abstract int getEntityTypeId();

src/main/java/emu/grasscutter/game/entity/gadget/GadgetGatherObject.java

@@ -14,6 +14,8 @@ import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
 import emu.grasscutter.net.proto.GatherGadgetInfoOuterClass.GatherGadgetInfo;
 import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
 import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
+import emu.grasscutter.scripts.constants.EventType;
+import emu.grasscutter.scripts.data.ScriptArgs;
 import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
 import emu.grasscutter.utils.Utils;
 
@@ -57,6 +59,12 @@ public final class GadgetGatherObject extends GadgetContent {
         GameItem item = new GameItem(itemData, 1);
         player.getInventory().addItem(item, ActionReason.Gather);
 
+        getGadget()
+                .getScene()
+                .getScriptManager()
+                .callEvent(
+                        new ScriptArgs(getGadget().getGroupId(), EventType.EVENT_GATHER, getGadget().getConfigId()));
+
         getGadget()
                 .getScene()
                 .broadcastPacket(

src/main/java/emu/grasscutter/game/props/EntityIdType.java

@@ -1,5 +1,8 @@
 package emu.grasscutter.game.props;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public enum EntityIdType {
     AVATAR(0x01),
     MONSTER(0x02),
@@ -12,10 +15,27 @@ public enum EntityIdType {
 
     private final int id;
 
+    private static final Map<Integer, EntityType> map = new HashMap<>();
+
+    static {
+        map.put(EntityIdType.AVATAR.getId(),EntityType.Avatar);
+        map.put(EntityIdType.MONSTER.getId(),EntityType.Monster);
+        map.put(EntityIdType.NPC.getId(),EntityType.NPC);
+        map.put(EntityIdType.GADGET.getId(),EntityType.Gadget);
+        map.put(EntityIdType.REGION.getId(),EntityType.Region);
+        map.put(EntityIdType.WEAPON.getId(),EntityType.Equip);
+        map.put(EntityIdType.TEAM.getId(),EntityType.Team);
+        map.put(EntityIdType.MPLEVEL.getId(),EntityType.MPLevel);
+    }
+
     EntityIdType(int id) {
         this.id = id;
     }
 
+    public static EntityType toEntityType(int entityId) {
+        return map.getOrDefault(entityId, EntityType.None);
+    }
+
     public int getId() {
         return id;
     }

src/main/java/emu/grasscutter/game/props/EntityType.java

@@ -75,6 +75,7 @@ public enum EntityType implements IntValueEnum {
     Screen(64),
     EchoShell(65),
     UIInteractGadget(66),
+    Region(98),
     PlaceHolder(99);
 
     private static final Int2ObjectMap<EntityType> map = new Int2ObjectOpenHashMap<>();