From 72deca29a067c643df0194a5aceda6a11494940e Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Mon, 11 Aug 2014 15:49:06 -0500
Subject: [PATCH] Update from upstream SpigotMC Part revert to fix (0) in place
 of file name SpigotMC/Spigot@2fbc1f2704f98f95ad2aaa623a28f73145f70a52 Fix the
 last PR SpigotMC/Spigot@b2199df3f75145b85f672286e231bf2fd5e4ae0e

---
 .../0152-Safer-JSON-Loading.patch             |  4 ++--
 ....c-as-an-element-not-an-extra-object.patch | 24 -------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 Spigot-Server-Patches/treat-this.c-as-an-element-not-an-extra-object.patch

diff --git a/CraftBukkit-Patches/0152-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0152-Safer-JSON-Loading.patch
index 04d9d08c3b..125bdc2194 100644
--- a/CraftBukkit-Patches/0152-Safer-JSON-Loading.patch
+++ b/CraftBukkit-Patches/0152-Safer-JSON-Loading.patch
@@ -15,10 +15,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Spigot Start
 +        } catch ( java.io.FileNotFoundException ex )
 +        {
-+            a.info( "Unable to find file {0}, creating it.", this.c );
++            org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.INFO, "Unable to find file {0}, creating it.", this.c );
 +        } catch ( net.minecraft.util.com.google.gson.JsonSyntaxException ex )
 +        {
-+            a.warn( "Unable to read file {0}, backing it up to {0}.backup and creating new copy.", this.c );
++            org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.WARNING, "Unable to read file {0}, backing it up to {0}.backup and creating new copy.", this.c );
 +            File backup = new File( this.c + ".backup" );
 +            this.c.renameTo( backup );
 +            this.c.delete();
diff --git a/Spigot-Server-Patches/treat-this.c-as-an-element-not-an-extra-object.patch b/Spigot-Server-Patches/treat-this.c-as-an-element-not-an-extra-object.patch
deleted file mode 100644
index be8d044b46..0000000000
--- a/Spigot-Server-Patches/treat-this.c-as-an-element-not-an-extra-object.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Suddenly <suddenly@suddenly.coffee>
-Date: Sat, 9 Aug 2014 19:23:26 -0500
-Subject: [PATCH] treat this.c as an element, not an extra object
-
-
-diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/JsonList.java
-+++ b/src/main/java/net/minecraft/server/JsonList.java
-@@ -0,0 +0,0 @@ public class JsonList {
-         // Spigot Start
-         } catch ( java.io.FileNotFoundException ex )
-         {
--            a.info( "Unable to find file {0}, creating it.", this.c );
-+            org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.INFO, "Unable to find file {0}, creating it.", this.c ); // PaperSpigot
-         } catch ( net.minecraft.util.com.google.gson.JsonSyntaxException ex )
-         {
--            a.warn( "Unable to read file {0}, backing it up to {0}.backup and creating new copy.", this.c );
-+            org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.WARNING, "Unable to read file {0}, backing it up to {0}.backup and creating new copy.", this.c ); // PaperSpigot
-             File backup = new File( this.c + ".backup" );
-             this.c.renameTo( backup );
-             this.c.delete();
---
\ No newline at end of file