Merge branch 'main' into dev-scene

This commit is contained in:
Melledy
2022-04-18 21:35:01 -07:00
parent e8261d568b
commit 057f568a37
21 changed files with 1334 additions and 548 deletions

View File

@@ -1,11 +1,6 @@
package emu.grasscutter.game;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.*;
import dev.morphia.annotations.*;
import emu.grasscutter.GenshinConstants;
@@ -494,7 +489,7 @@ public class GenshinPlayer {
this.regionId = regionId;
}
public boolean hasGodmode() {
public boolean inGodmode() {
return godmode;
}
@@ -567,6 +562,15 @@ public class GenshinPlayer {
public void dropMessage(Object message) {
this.sendPacket(new PacketPrivateChatNotify(GenshinConstants.SERVER_CONSOLE_UID, getId(), message.toString()));
}
/**
* Sends a message to another player.
* @param sender The sender of the message.
* @param message The message to send.
*/
public void sendMessage(GenshinPlayer sender, Object message) {
this.sendPacket(new PacketPrivateChatNotify(sender.getId(), this.getId(), message.toString()));
}
public void interactWith(int gadgetEntityId) {
GenshinEntity entity = getScene().getEntityById(gadgetEntityId);