From 8022d678b3341d8a7e035de32934f102523521b3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 18 Apr 2015 15:14:31 -0500 Subject: [PATCH] Fix the repo's patches because I can't merge things today Thanks to Byteflux for all the PRs you see below bringing 1.8 PaperSpigot that much closer to feature parity with it's 1.7 branch --- ...Add-FallingBlock-source-location-API.patch | 20 +++++++++++++++++-- .../0044-Optimize-draining.patch | 2 +- ...-crits-helps-mitigate-hacked-client.patch} | 6 +++--- 3 files changed, 22 insertions(+), 6 deletions(-) rename Spigot-Server-Patches/{0042-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0045-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (94%) diff --git a/Spigot-Server-Patches/0042-Add-FallingBlock-source-location-API.patch b/Spigot-Server-Patches/0042-Add-FallingBlock-source-location-API.patch index 9ae289863e..2a21c13cfe 100644 --- a/Spigot-Server-Patches/0042-Add-FallingBlock-source-location-API.patch +++ b/Spigot-Server-Patches/0042-Add-FallingBlock-source-location-API.patch @@ -1,4 +1,4 @@ -From 6a543f6806490bcf2a1ae8aa21db1851fe895316 Mon Sep 17 00:00:00 2001 +From e798133865d1748942c87c62b7025570ddde9f1f Mon Sep 17 00:00:00 2001 From: Byteflux Date: Fri, 17 Apr 2015 02:26:14 -0700 Subject: [PATCH] Add FallingBlock source location API @@ -20,6 +20,22 @@ index de7ac6f..76a6272 100644 } else { world.setAir(blockposition); +diff --git a/src/main/java/net/minecraft/server/BlockFalling.java b/src/main/java/net/minecraft/server/BlockFalling.java +index 29f8554..1d952b8 100644 +--- a/src/main/java/net/minecraft/server/BlockFalling.java ++++ b/src/main/java/net/minecraft/server/BlockFalling.java +@@ -36,7 +36,10 @@ public class BlockFalling extends Block { + + if (!BlockFalling.instaFall && world.areChunksLoadedBetween(blockposition.a(-b0, -b0, -b0), blockposition.a(b0, b0, b0))) { + if (!world.isClientSide) { +- EntityFallingBlock entityfallingblock = new EntityFallingBlock(world, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, world.getType(blockposition)); ++ // PaperSpigot start - Add FallingBlock source location API ++ org.bukkit.Location loc = new org.bukkit.Location(world.getWorld(), (double) ((float) blockposition.getX() + 0.5F), (double) blockposition.getY(), (double) ((float) blockposition.getZ() + 0.5F)); ++ EntityFallingBlock entityfallingblock = new EntityFallingBlock(loc, world, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, world.getType(blockposition)); ++ // PaperSpigot end + + this.a(entityfallingblock); + world.addEntity(entityfallingblock); diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java index 5931e1d..44219cd 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -125,5 +141,5 @@ index 788f26b..f2dfedd 100644 + // PaperSpigot end } -- -1.9.4.msysgit.2 +2.3.5 diff --git a/Spigot-Server-Patches/0044-Optimize-draining.patch b/Spigot-Server-Patches/0044-Optimize-draining.patch index 162fd0eafe..bf815131ba 100644 --- a/Spigot-Server-Patches/0044-Optimize-draining.patch +++ b/Spigot-Server-Patches/0044-Optimize-draining.patch @@ -1,4 +1,4 @@ -From 852a6da14b49302a346b8e6ded8c99ae1f746499 Mon Sep 17 00:00:00 2001 +From 2ddb6a4a68cca73f8fcf579b42a381a1156b248f Mon Sep 17 00:00:00 2001 From: Byteflux Date: Fri, 10 Apr 2015 02:24:20 -0700 Subject: [PATCH] Optimize draining diff --git a/Spigot-Server-Patches/0042-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0045-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 94% rename from Spigot-Server-Patches/0042-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to Spigot-Server-Patches/0045-Toggleable-player-crits-helps-mitigate-hacked-client.patch index 54e146899e..9d10b5f303 100644 --- a/Spigot-Server-Patches/0042-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/Spigot-Server-Patches/0045-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -1,4 +1,4 @@ -From a160858ab392e4bd6390cf79cb1646f5e70abc72 Mon Sep 17 00:00:00 2001 +From 80e45c4e71cabb79b8452ffc301c4ffd1ebe23c4 Mon Sep 17 00:00:00 2001 From: Roman Alexander Date: Fri, 27 Mar 2015 00:52:24 -0400 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients. @@ -18,7 +18,7 @@ index 4aa8096..ec69752 100644 if (flag && f > 0.0F) { f *= 1.5F; diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index fa4a7d7..36a9f0b 100644 +index 1ca8b0d..64f8630 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -182,9 +182,11 @@ public class PaperSpigotWorldConfig @@ -34,5 +34,5 @@ index fa4a7d7..36a9f0b 100644 public boolean netherVoidTopDamage; -- -1.9.4.msysgit.2 +2.3.5