diff --git a/Spigot-Server-Patches/0024-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch b/Spigot-Server-Patches/0024-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch index ca60b8326b..9e6cac65d8 100644 --- a/Spigot-Server-Patches/0024-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch +++ b/Spigot-Server-Patches/0024-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch @@ -1,4 +1,4 @@ -From 4c3bc969af53090ac4f77e01f7d0014d58bf2454 Mon Sep 17 00:00:00 2001 +From 61f16c7a18f6f4437a5e0755fbb99554d11ffcc4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 19 Aug 2014 14:21:37 -0500 Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and @@ -6,10 +6,10 @@ Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5736d88..86b8cb2 100644 +index 90072fd..e558b31 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1045,7 +1045,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -1049,7 +1049,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs } public String getServerModName() { diff --git a/Spigot-Server-Patches/0038-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch b/Spigot-Server-Patches/0038-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch index 53d469b73a..8860b39fc1 100644 --- a/Spigot-Server-Patches/0038-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch +++ b/Spigot-Server-Patches/0038-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch @@ -1,11 +1,11 @@ -From 581c061807816b5f6b20072cac4443d70b381dfa Mon Sep 17 00:00:00 2001 +From bd555ed341785d0de3e363096cae37d788b7b403 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Sun, 30 Nov 2014 18:58:07 -0600 Subject: [PATCH] Allow specified ItemStacks to retain their invalid data diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index a00c3f4..e5af375 100644 +index 596db09..5e8f1c7 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -17,6 +17,8 @@ import org.bukkit.entity.Player; @@ -17,7 +17,7 @@ index a00c3f4..e5af375 100644 public final class ItemStack { public static final DecimalFormat a = new DecimalFormat("#.###"); -@@ -286,9 +288,13 @@ public final class ItemStack { +@@ -304,9 +306,13 @@ public final class ItemStack { } // Is this a block?