diff --git a/Spigot-Server-Patches/0001-POM-changes.patch b/Spigot-Server-Patches/0001-POM-changes.patch index 95fc3b04b9..df79eb8b24 100644 --- a/Spigot-Server-Patches/0001-POM-changes.patch +++ b/Spigot-Server-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From ea806b04341d78de32ad9e2aa7ad67facd21aeb7 Mon Sep 17 00:00:00 2001 +From 782c21dd59776700f5dec8b4c5f268171b33c757 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 21 Jul 2014 15:36:01 -0500 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 3c0cdff..0c8fbd5 100644 +index 0d00e79..58a7b1b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -54,7 +54,7 @@ index 3c0cdff..0c8fbd5 100644 minecraft-server ${minecraft.version}-SNAPSHOT jar -@@ -126,7 +126,7 @@ +@@ -119,7 +119,7 @@ gitdescribe-maven-plugin 1.3 diff --git a/Spigot-Server-Patches/0038-Temporary-fix-for-rails-dupe.patch b/Spigot-Server-Patches/0038-Temporary-fix-for-rails-dupe.patch index a6632a2186..af10b6316c 100644 --- a/Spigot-Server-Patches/0038-Temporary-fix-for-rails-dupe.patch +++ b/Spigot-Server-Patches/0038-Temporary-fix-for-rails-dupe.patch @@ -1,16 +1,16 @@ -From 8f0bafafcc47878484eb88076d3198c0dec7dd43 Mon Sep 17 00:00:00 2001 +From 344248bcdb3a81dca026e29d05ac86f141bb20b0 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Sun, 31 Aug 2014 18:12:10 +0100 Subject: [PATCH] Temporary fix for rails dupe diff --git a/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java -index d36aacb..925c1f9 100644 +index d36aacb..b6b4146 100644 --- a/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java +++ b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java @@ -105,8 +105,12 @@ public abstract class BlockMinecartTrackAbstract extends Block { } - + if (flag) { - this.b(world, i, j, k, world.getData(i, j, k), 0); - world.setAir(i, j, k); @@ -23,6 +23,6 @@ index d36aacb..925c1f9 100644 } else { this.a(world, i, j, k, l, i1, block); } --- -1.9.4.msysgit.0 +-- +1.9.1 diff --git a/Spigot-Server-Patches/0037-Show-paperspigot-in-protocol-warning.patch b/Spigot-Server-Patches/0039-Show-paperspigot-in-protocol-warning.patch similarity index 95% rename from Spigot-Server-Patches/0037-Show-paperspigot-in-protocol-warning.patch rename to Spigot-Server-Patches/0039-Show-paperspigot-in-protocol-warning.patch index 48e45bec36..ef4786bab0 100644 --- a/Spigot-Server-Patches/0037-Show-paperspigot-in-protocol-warning.patch +++ b/Spigot-Server-Patches/0039-Show-paperspigot-in-protocol-warning.patch @@ -1,4 +1,4 @@ -From d3f684ab6a6f1bd38363994424ad95dfd8078b4a Mon Sep 17 00:00:00 2001 +From 8c17e7dde8ae985ee00aac0a2a39ecb1261215e7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 1 Sep 2014 14:41:31 -0500 Subject: [PATCH] Show paperspigot in protocol warning