From 5d7c5da5006c889edae646346be4d515f4665d1c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 20 Jun 2015 22:05:36 -0500 Subject: [PATCH] Rebuild patches --- .../0004-Player-affects-spawning-API.patch | 8 ++++---- .../0019-Player-affects-spawning-API.patch | 8 ++++---- .../0032-Add-async-chunk-load-API.patch | 8 ++++---- .../0034-Add-TNT-source-location-API.patch | 8 ++++---- .../0041-Add-FallingBlock-source-location-API.patch | 10 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch index 8fa9b1dd4..54573c579 100644 --- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch @@ -1,14 +1,14 @@ -From 6d1840fc74641a4aec920b5be691d14efaa8df6d Mon Sep 17 00:00:00 2001 +From b0bbe96b13f89c92ddce9cda774346b2fb587fa4 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 8 Aug 2014 22:51:26 -0500 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 83cc008..5c5e818 100644 +index e3dd596..9d23835 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1131,6 +1131,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1140,6 +1140,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); } @@ -38,5 +38,5 @@ index 83cc008..5c5e818 100644 Spigot spigot(); -- -2.4.2.windows.1 +2.4.3.windows.1 diff --git a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch index 447a47cfc..af0f6af49 100644 --- a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From b87c4f1f38529e2a133fc96231d7a89c262695d1 Mon Sep 17 00:00:00 2001 +From 5eba83b399ef2be6205f772a5824876c88f45a8d Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Mon, 18 May 2015 17:52:45 -0500 Subject: [PATCH] Player affects spawning API @@ -167,7 +167,7 @@ index 8bcb4ad..fae5eb7 100644 for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman = (EntityHuman) this.players.get(i); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3162541..8fd876f 100644 +index d0312a7..07aaec1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -7,6 +7,7 @@ import io.netty.buffer.Unpooled; @@ -178,7 +178,7 @@ index 3162541..8fd876f 100644 import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.ArrayList; -@@ -1450,6 +1451,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1456,6 +1457,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { packet.components = components; getHandle().playerConnection.sendPacket(packet); } @@ -198,5 +198,5 @@ index 3162541..8fd876f 100644 public Player.Spigot spigot() -- -2.4.2.windows.1 +2.4.3.windows.1 diff --git a/Spigot-Server-Patches/0032-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0032-Add-async-chunk-load-API.patch index 917c10cf2..c064d5dc4 100644 --- a/Spigot-Server-Patches/0032-Add-async-chunk-load-API.patch +++ b/Spigot-Server-Patches/0032-Add-async-chunk-load-API.patch @@ -1,14 +1,14 @@ -From eb06b41aca9e0fd4e2a19ba874b072216268aef2 Mon Sep 17 00:00:00 2001 +From d75ed57ede3da98d25c9f78d2c6f0251832db8c0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 6 Nov 2014 18:29:20 -0600 Subject: [PATCH] Add async chunk load API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index db0697b..dc45452 100644 +index 89163ea..39423d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -121,6 +121,24 @@ public class CraftWorld implements World { +@@ -122,6 +122,24 @@ public class CraftWorld implements World { } } @@ -34,5 +34,5 @@ index db0697b..dc45452 100644 return this.world.chunkProviderServer.getChunkAt(x, z).bukkitChunk; } -- -2.4.1.windows.1 +2.4.3.windows.1 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 59afabb8b..d5ce8c76d 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 e6402cbeeefef6ec7d655170b0a3b2ff07663a34 Mon Sep 17 00:00:00 2001 +From df67df05ad81fd4a2ec110545107b3b1d14df5ce 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 @@ -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 dc45452..6b5800e 100644 +index 39423d2..713a7c0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1112,7 +1112,8 @@ public class CraftWorld implements World { +@@ -1113,7 +1113,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.1.windows.1 +2.4.3.windows.1 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 eb4ad1680..1b8c9bf70 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 87587c598e48d91a11651621025f5d72fdd558f8 Mon Sep 17 00:00:00 2001 +From bf4c75294ad48d09f70b5bc21e6489cb5912edd3 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 6b5800e..f479b50 100644 +index 713a7c0..cba342b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -888,7 +888,10 @@ public class CraftWorld implements World { +@@ -889,7 +889,10 @@ public class CraftWorld implements World { double y = location.getBlockY() + 0.5; double z = location.getBlockZ() + 0.5; @@ -111,7 +111,7 @@ index 6b5800e..f479b50 100644 entity.ticksLived = 1; world.addEntity(entity, SpawnReason.CUSTOM); -@@ -923,8 +926,10 @@ public class CraftWorld implements World { +@@ -924,8 +927,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 } -- -1.9.5.msysgit.1 +2.4.3.windows.1