From 1d56455b8eea2a7bb568ccbe6b456b5eb387fe08 Mon Sep 17 00:00:00 2001
From: Skydark Chen <skydark2@gmail.com>
Date: Wed, 13 Jan 2016 20:29:56 +0800
Subject: [PATCH 1/2] Add unicode support for json files

---
 src/main/java/dmillerw/lore/common/lore/LoreLoader.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/dmillerw/lore/common/lore/LoreLoader.java b/src/main/java/dmillerw/lore/common/lore/LoreLoader.java
index 844f0d8..f039ab9 100644
--- a/src/main/java/dmillerw/lore/common/lore/LoreLoader.java
+++ b/src/main/java/dmillerw/lore/common/lore/LoreLoader.java
@@ -12,7 +12,8 @@
 import org.apache.commons.io.FilenameUtils;
 
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
 import java.util.*;
 
 /**
@@ -57,7 +58,8 @@ public int compare(Lore o1, Lore o2) {
     }
 
     public static void loadLore(File file) throws Exception {
-        Lore lore = JsonUtil.gson().fromJson(new FileReader(file), Lore.class);
+        Lore lore = JsonUtil.gson().fromJson(new InputStreamReader(
+                    new FileInputStream(file), "UTF-8"), Lore.class);
 
         if (!categories.contains(lore.category))
             categories.add(lore.category);

From c53e398a15a4d575f074f204d91c11a71fd6c696 Mon Sep 17 00:00:00 2001
From: Skydark Chen <skydark2@gmail.com>
Date: Wed, 13 Jan 2016 20:45:46 +0800
Subject: [PATCH 2/2] Fix packet handler's side

---
 .../dmillerw/lore/common/network/packet/PacketNotification.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/dmillerw/lore/common/network/packet/PacketNotification.java b/src/main/java/dmillerw/lore/common/network/packet/PacketNotification.java
index 6805417..73b7c1f 100644
--- a/src/main/java/dmillerw/lore/common/network/packet/PacketNotification.java
+++ b/src/main/java/dmillerw/lore/common/network/packet/PacketNotification.java
@@ -50,7 +50,7 @@ public static class Handler implements IMessageHandler<PacketNotification, IMess
         @Override
         public IMessage onMessage(PacketNotification message, MessageContext ctx) {
             World clientWorld = LoreExpansion.proxy.getClientWorld();
-            if (clientWorld == null) {
+            if (clientWorld != null) {
                 if (message.type == TYPE_CLIENT_PICKUP || message.type == TYPE_CLIENT_AUTOPLAY) {
                     LoreExpansion.proxy.handleNotificationPacket(message, ctx);
                 }