SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update from upstream SpigotMC

Browse Source 
Part revert to fix (0) in place of file name SpigotMC/Spigot@2fbc1f2704
Fix the last PR SpigotMC/Spigot@b2199df3f7
This commit is contained in:
Zach Brown
2014-08-11 15:49:06 -05:00
parent 187d3ce632
commit 72deca29a0
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CraftBukkit-Patches/0152-Safer-JSON-Loading.patch
View File

@@ -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();