From f587cc6cfa203501a848b460bd2f31764873933b Mon Sep 17 00:00:00 2001 From: Emmanuel Lampe Date: Mon, 13 Apr 2020 12:38:35 +0200 Subject: [PATCH] Fixed labymod emote --- api/src/main/java/net/jitse/npclib/internal/NPCBase.java | 2 +- api/src/main/java/net/labymod/utilities/LMCUtils.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/net/jitse/npclib/internal/NPCBase.java b/api/src/main/java/net/jitse/npclib/internal/NPCBase.java index 58c50b1..304b0b5 100644 --- a/api/src/main/java/net/jitse/npclib/internal/NPCBase.java +++ b/api/src/main/java/net/jitse/npclib/internal/NPCBase.java @@ -98,7 +98,7 @@ public abstract class NPCBase implements NPC, NPCPacketHandler { forcedEmote.addProperty("uuid", uuid.toString()); forcedEmote.addProperty("emote_id", emoteId); array.add(forcedEmote); - LMCUtils.sendLMCMessage(receiver, "emote_api", array.getAsJsonObject()); + LMCUtils.sendLMCMessage(receiver, "emote_api", array); } public void disableFOV() { diff --git a/api/src/main/java/net/labymod/utilities/LMCUtils.java b/api/src/main/java/net/labymod/utilities/LMCUtils.java index 9320905..d77d40b 100644 --- a/api/src/main/java/net/labymod/utilities/LMCUtils.java +++ b/api/src/main/java/net/labymod/utilities/LMCUtils.java @@ -1,6 +1,7 @@ package net.labymod.utilities; import com.comphenix.tinyprotocol.Reflection; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -30,9 +31,9 @@ public class LMCUtils { * * @param player Minecraft Client * @param key LMC message key - * @param messageContent json object content + * @param messageContent json element */ - public static void sendLMCMessage(Player player, String key, JsonObject messageContent) { + public static void sendLMCMessage(Player player, String key, JsonElement messageContent) { byte[] bytes = LMCUtils.getBytesToSend(key, messageContent.toString()); // 12/4/20, JMB: Converted into reflections for multi-version support: