From 929b5b0452143552fc2fd714c26865f94fd8c223 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jun 2015 01:18:29 -0500 Subject: [PATCH] Patch rebuild --- .../0034-Add-TNT-source-location-API.patch | 12 ++++++------ .../0041-Add-FallingBlock-source-location-API.patch | 10 +++++----- .../0053-Configurable-TNT-cannon-fix.patch | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Spigot-Server-Patches/0034-Add-TNT-source-location-API.patch b/Spigot-Server-Patches/0034-Add-TNT-source-location-API.patch index d5ce8c76d..634369cf8 100644 --- a/Spigot-Server-Patches/0034-Add-TNT-source-location-API.patch +++ b/Spigot-Server-Patches/0034-Add-TNT-source-location-API.patch @@ -1,4 +1,4 @@ -From df67df05ad81fd4a2ec110545107b3b1d14df5ce Mon Sep 17 00:00:00 2001 +From ae17028cabb06028ba0d90caf89b34cbcc421ca2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 04:23:41 -0500 Subject: [PATCH] Add TNT source location API @@ -29,10 +29,10 @@ index 40c0a87..3a0bc4b 100644 world.addEntity(entitytntprimed); world.makeSound(entitytntprimed, "game.tnt.primed", 1.0F, 1.0F); diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java -index f91c33d..f3858d1 100644 +index bd88be5..950db4d 100644 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java -@@ -540,7 +540,7 @@ public class DispenserRegistry { +@@ -541,7 +541,7 @@ public class DispenserRegistry { } } @@ -98,10 +98,10 @@ index 50423eb..1daba4e 100644 public EntityLiving getSource() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 39423d2..713a7c0 100644 +index da84cd5..a5de9aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1113,7 +1113,8 @@ public class CraftWorld implements World { +@@ -1110,7 +1110,8 @@ public class CraftWorld implements World { throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location); } } else if (TNTPrimed.class.isAssignableFrom(clazz)) { @@ -128,5 +128,5 @@ index e08ad47..b7e8b4d 100644 + // PaperSpigot end } -- -2.4.3.windows.1 +2.4.4.windows.2 diff --git a/Spigot-Server-Patches/0041-Add-FallingBlock-source-location-API.patch b/Spigot-Server-Patches/0041-Add-FallingBlock-source-location-API.patch index 1b8c9bf70..0a3bc5a01 100644 --- a/Spigot-Server-Patches/0041-Add-FallingBlock-source-location-API.patch +++ b/Spigot-Server-Patches/0041-Add-FallingBlock-source-location-API.patch @@ -1,4 +1,4 @@ -From bf4c75294ad48d09f70b5bc21e6489cb5912edd3 Mon Sep 17 00:00:00 2001 +From ff43f17197527991ea1a261b7137e23c4dbe087d 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 @@ -96,10 +96,10 @@ index 5931e1d..44219cd 100644 public void a(boolean flag) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 713a7c0..cba342b 100644 +index a5de9aa..ce10832 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -889,7 +889,10 @@ public class CraftWorld implements World { +@@ -886,7 +886,10 @@ public class CraftWorld implements World { double y = location.getBlockY() + 0.5; double z = location.getBlockZ() + 0.5; @@ -111,7 +111,7 @@ index 713a7c0..cba342b 100644 entity.ticksLived = 1; world.addEntity(entity, SpawnReason.CUSTOM); -@@ -924,8 +927,10 @@ public class CraftWorld implements World { +@@ -921,8 +924,10 @@ public class CraftWorld implements World { IBlockData blockData = world.getType(new BlockPosition(x, y, z)); int type = CraftMagicNumbers.getId(blockData.getBlock()); int data = blockData.getBlock().toLegacyData(blockData); @@ -141,5 +141,5 @@ index 788f26b..f2dfedd 100644 + // PaperSpigot end } -- -2.4.3.windows.1 +2.4.4.windows.2 diff --git a/Spigot-Server-Patches/0053-Configurable-TNT-cannon-fix.patch b/Spigot-Server-Patches/0053-Configurable-TNT-cannon-fix.patch index 90765ac59..8cb54db60 100644 --- a/Spigot-Server-Patches/0053-Configurable-TNT-cannon-fix.patch +++ b/Spigot-Server-Patches/0053-Configurable-TNT-cannon-fix.patch @@ -1,4 +1,4 @@ -From 3858cdd37e152fb8db8c5618a7ea4d10fa49605c Mon Sep 17 00:00:00 2001 +From 942cb1cd958e2f53867973e9bc61a89c09286055 Mon Sep 17 00:00:00 2001 From: Iceee Date: Thu, 4 Jun 2015 13:55:02 -0700 Subject: [PATCH] Configurable TNT cannon fix @@ -155,10 +155,10 @@ index 3a0bc4b..a901742 100644 world.addEntity(entitytntprimed); world.makeSound(entitytntprimed, "game.tnt.primed", 1.0F, 1.0F); diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java -index f3858d1..d8e1609 100644 +index 950db4d..8700ab1 100644 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java -@@ -519,7 +519,11 @@ public class DispenserRegistry { +@@ -520,7 +520,11 @@ public class DispenserRegistry { org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ()); CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1); @@ -346,5 +346,5 @@ index 8338cc6..3edd322 100644 + } } -- -2.4.2.windows.1 +2.4.4.windows.2