Update from upstream SpigotMC

Part revert to fix (0) in place of file name SpigotMC/Spigot@2fbc1f2704
Fix the last PR SpigotMC/Spigot@b2199df3f7

CraftBukkit-Patches/0152-Safer-JSON-Loading.patch

@@ -1,11 +1,11 @@
-From 357d82dd4e4a803381078f2f7975b9c760c6018b Mon Sep 17 00:00:00 2001
+From 4be74f79773f25c1b4551499ee4b476512af9f19 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 8 Jul 2014 09:44:18 +1000
 Subject: [PATCH] Safer JSON Loading
 
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 9d1cb33..3ef40f2 100644
+index 9d1cb33..71ae29e 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -146,6 +146,17 @@ public class JsonList {
@@ -15,10 +15,10 @@ index 9d1cb33..3ef40f2 100644
 +        // 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();

Spigot-Server-Patches/0033-treat-this.c-as-an-element-not-an-extra-object.patch

@@ -1,26 +0,0 @@
-From 569c585a9911742f9189ed7550aed33083dc98f1 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 3ef40f2..8beda81 100644
---- a/src/main/java/net/minecraft/server/JsonList.java
-+++ b/src/main/java/net/minecraft/server/JsonList.java
-@@ -149,10 +149,10 @@ 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();
--- 
-1.9.1
-