Jona123
/
NPCLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #68 from rexlManu/master 

Fixed labymod emote
This commit is contained in:
Jitse Boonstra 2020-04-13 12:51:40 +02:00 committed by GitHub
parent 5ca2599e6e f587cc6cfa
commit a9d2e090a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/net/jitse/npclib/internal/NPCBase.java
View File

@ -98,7 +98,7 @@ public abstract class NPCBase implements NPC, NPCPacketHandler {
forcedEmote.addProperty("uuid", uuid.toString()); forcedEmote.addProperty("uuid", uuid.toString());
forcedEmote.addProperty("emote_id", emoteId); forcedEmote.addProperty("emote_id", emoteId);
array.add(forcedEmote); array.add(forcedEmote);
LMCUtils.sendLMCMessage(receiver, "emote_api", array.getAsJsonObject()); LMCUtils.sendLMCMessage(receiver, "emote_api", array);
} }
public void disableFOV() { public void disableFOV() {

5
api/src/main/java/net/labymod/utilities/LMCUtils.java
View File

@ -1,6 +1,7 @@
package net.labymod.utilities; package net.labymod.utilities;
import com.comphenix.tinyprotocol.Reflection; import com.comphenix.tinyprotocol.Reflection;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
@ -30,9 +31,9 @@ public class LMCUtils {
* *
* @param player Minecraft Client * @param player Minecraft Client
* @param key LMC message key * @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()); byte[] bytes = LMCUtils.getBytesToSend(key, messageContent.toString());
// 12/4/20, JMB: Converted into reflections for multi-version support: // 12/4/20, JMB: Converted into reflections for multi-version support: