From 7330b853ec407d456a2dda9d6d453a3f3a367f72 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jun 2015 19:51:26 +1000 Subject: [SPIGOT-461] Use a more appropriate collection for conccurent UserCache --- nms-patches/UserCache.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 nms-patches/UserCache.patch (limited to 'nms-patches/UserCache.patch') diff --git a/nms-patches/UserCache.patch b/nms-patches/UserCache.patch new file mode 100644 index 00000000..8db04afc --- /dev/null +++ b/nms-patches/UserCache.patch @@ -0,0 +1,25 @@ +--- a/net/minecraft/server/UserCache.java ++++ b/net/minecraft/server/UserCache.java +@@ -42,7 +42,7 @@ + public static final SimpleDateFormat a = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); + private final Map c = Maps.newHashMap(); + private final Map d = Maps.newHashMap(); +- private final LinkedList e = Lists.newLinkedList(); ++ private final java.util.Deque e = new java.util.concurrent.ConcurrentLinkedDeque(); // CraftBukkit + private final MinecraftServer f; + protected final Gson b; + private final File g; +@@ -323,11 +323,11 @@ + } + } + +- public JsonElement serialize(Object object, Type type, JsonSerializationContext jsonserializationcontext) { ++ public JsonElement serialize(UserCacheEntry object, Type type, JsonSerializationContext jsonserializationcontext) { // CraftBukkit - decompile error + return this.a((UserCache.UserCacheEntry) object, type, jsonserializationcontext); + } + +- public Object deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { ++ public UserCacheEntry deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { // CraftBukkit - decompile error + return this.a(jsonelement, type, jsondeserializationcontext); + } + -- cgit v1.2.3