From 04d72bc702ac0e056975055df11cb28bc9cc6411 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 2 Apr 2014 17:54:35 +1100 Subject: [PATCH] Merge some stuff from upstream. --- Bukkit | 2 +- Bukkit-Patches/0008-Add-Particle-API.patch | 6 +++--- Bukkit-Patches/0024-Silenceable-Lightning-API.patch | 6 +++--- CraftBukkit | 2 +- .../0003-Skeleton-API-Implementations.patch | 8 ++++---- CraftBukkit-Patches/0046-Player-Collision-API.patch | 8 ++++---- .../0049-Cap-Minimum-Player-Speed.patch | 10 +++++----- CraftBukkit-Patches/0055-Implement-respawn-API.patch | 8 ++++---- CraftBukkit-Patches/0060-BungeeCord-Support.patch | 8 ++++---- CraftBukkit-Patches/0073-Particle-API.patch | 8 ++++---- ...0079-Disable-Connected-Check-on-setScoreboard.patch | 8 ++++---- .../0100-Implement-Locale-Getter-for-Players.patch | 8 ++++---- .../0105-Add-support-for-fetching-hidden-players.patch | 8 ++++---- .../0107-Cap-Channel-Registrations.patch | 8 ++++---- 14 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Bukkit b/Bukkit index 4bc86be..1741b91 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit 4bc86be459a7ce310f523ca03e2908c1d29956f4 +Subproject commit 1741b91175e4febb000683ac6bc00c4b198e6c47 diff --git a/Bukkit-Patches/0008-Add-Particle-API.patch b/Bukkit-Patches/0008-Add-Particle-API.patch index 32aefe4..8e45fad 100644 --- a/Bukkit-Patches/0008-Add-Particle-API.patch +++ b/Bukkit-Patches/0008-Add-Particle-API.patch @@ -1,4 +1,4 @@ -From 855a6da4ddb7bcb75cd4c45e2dcb2b9a42c4f6f4 Mon Sep 17 00:00:00 2001 +From 0d3d7850cc74fecc1cddc555e26103f2d44c7b01 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:57:09 +1000 Subject: [PATCH] Add Particle API @@ -266,10 +266,10 @@ index 2474a2d..9964203 100644 + public enum Type {SOUND, VISUAL, PARTICLE} } diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index f02bfb7..a58eb05 100644 +index 9bf2c41..6cf3ff0 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1151,6 +1151,56 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1155,6 +1155,56 @@ public interface World extends PluginMessageRecipient, Metadatable { */ public boolean isGameRule(String rule); diff --git a/Bukkit-Patches/0024-Silenceable-Lightning-API.patch b/Bukkit-Patches/0024-Silenceable-Lightning-API.patch index 186f2c5..8062a66 100644 --- a/Bukkit-Patches/0024-Silenceable-Lightning-API.patch +++ b/Bukkit-Patches/0024-Silenceable-Lightning-API.patch @@ -1,14 +1,14 @@ -From ee7e81c4564a2917dbf3432275366f1e0a0d5eba Mon Sep 17 00:00:00 2001 +From 4a9e3da0eefb80e5c6eea75b99f965da7d4d7354 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:29 -0400 Subject: [PATCH] Silenceable Lightning API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index a58eb05..80ca41a 100644 +index 6cf3ff0..ab73174 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1196,6 +1196,30 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1200,6 +1200,30 @@ public interface World extends PluginMessageRecipient, Metadatable { { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/CraftBukkit b/CraftBukkit index cf5a547..08fad7a 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit cf5a547b996b18361a9eed290cdbbf0fdb03b096 +Subproject commit 08fad7ab1f5ee2662e746b3fd78f14e80084e9b9 diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index ebb8566..5544f4a 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 8bba02b152cd01cec04b8d95b96dbc3c357760ea Mon Sep 17 00:00:00 2001 +From 1cc16373af997e6e986bf481fb714bf991859bc4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -64,10 +64,10 @@ index fe0f200..e026c1f 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index da574e0..b045cb9 100644 +index 4c19370..1d71ff7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1252,4 +1252,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1253,4 +1253,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } collection.add(new AttributeModifiable(getHandle().bb(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true))); } @@ -84,5 +84,5 @@ index da574e0..b045cb9 100644 + // Spigot end } -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0046-Player-Collision-API.patch b/CraftBukkit-Patches/0046-Player-Collision-API.patch index 1b0c36d..6fe43f4 100644 --- a/CraftBukkit-Patches/0046-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0046-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From 46c4c10732506e3dfdff3bdc7303210050a0a003 Mon Sep 17 00:00:00 2001 +From 860e77cf4f2406d97b047e02f8f15a69e0bcce05 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:27:07 +1000 Subject: [PATCH] Player Collision API @@ -57,10 +57,10 @@ index 8d98a70..d32a2d2 100644 public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) { super(worldserver, gameprofile); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b03037a..d251e79 100644 +index fdc888d..d61e6fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1257,6 +1257,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1258,6 +1258,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Spigot start private final Player.Spigot spigot = new Player.Spigot() { @@ -81,5 +81,5 @@ index b03037a..d251e79 100644 public Player.Spigot spigot() -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch index 23f4eab..e0297e8 100644 --- a/CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch +++ b/CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch @@ -1,14 +1,14 @@ -From 21ecc7a983df97c214c0d2d90c1fc6c0739cc5bb Mon Sep 17 00:00:00 2001 +From f63feee9a42d228213e66d8be6428724630265e9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 5 Aug 2013 20:17:20 +1000 Subject: [PATCH] Cap Minimum Player Speed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d251e79..6903d41 100644 +index d61e6fc..df6569a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1129,7 +1129,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1130,7 +1130,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setFlySpeed(float value) { validateSpeed(value); EntityPlayer player = getHandle(); @@ -17,7 +17,7 @@ index d251e79..6903d41 100644 player.updateAbilities(); } -@@ -1137,7 +1137,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1138,7 +1138,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setWalkSpeed(float value) { validateSpeed(value); EntityPlayer player = getHandle(); @@ -27,5 +27,5 @@ index d251e79..6903d41 100644 } -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0055-Implement-respawn-API.patch b/CraftBukkit-Patches/0055-Implement-respawn-API.patch index 07facd2..7f7d64e 100644 --- a/CraftBukkit-Patches/0055-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0055-Implement-respawn-API.patch @@ -1,14 +1,14 @@ -From 0ad400b8b6a6fc0e35b79f725fafc98c4aec1746 Mon Sep 17 00:00:00 2001 +From 062f40ae66aa1e8d5c3b3884cc75036a670c9c7f Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:34:49 +0200 Subject: [PATCH] Implement respawn API. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6903d41..48be84e 100644 +index df6569a..b96c27a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1270,6 +1270,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1271,6 +1271,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().collidesWithEntities = collides; getHandle().k = collides; // First boolean of Entity } @@ -25,5 +25,5 @@ index 6903d41..48be84e 100644 public Player.Spigot spigot() -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0060-BungeeCord-Support.patch b/CraftBukkit-Patches/0060-BungeeCord-Support.patch index c04f783..795c80a 100644 --- a/CraftBukkit-Patches/0060-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0060-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 2498f80d97f1bc9ee50875dc0f9d496c6eb161ce Mon Sep 17 00:00:00 2001 +From e22e6ecb8c26223ad7a763ddfe1c7f7882092397 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -98,10 +98,10 @@ index 385dc0a..0d6ffef 100644 if (this.banByName.isBanned(gameprofile.getName())) { BanEntry banentry = (BanEntry) this.banByName.getEntries().get(gameprofile.getName()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 48be84e..8b6e210 100644 +index b96c27a..10a91fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1259,6 +1259,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1260,6 +1260,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { { @Override @@ -134,5 +134,5 @@ index 2ea1be7..08bd5ba 100644 + } } -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0073-Particle-API.patch b/CraftBukkit-Patches/0073-Particle-API.patch index 632e900..b07e907 100644 --- a/CraftBukkit-Patches/0073-Particle-API.patch +++ b/CraftBukkit-Patches/0073-Particle-API.patch @@ -1,4 +1,4 @@ -From ec9455abc409d77b5d09d9359f4a2fd61451c88e Mon Sep 17 00:00:00 2001 +From 0eb0cb2006777daefa553a233b4ececf0b365e6f Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -117,10 +117,10 @@ index bfa8c23..827ec16 100644 public Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a2638bc..03be384 100644 +index 58d1435..1d2a080 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1292,6 +1292,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1293,6 +1293,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player { server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false ); } } @@ -171,5 +171,5 @@ index a2638bc..03be384 100644 public Player.Spigot spigot() -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch index 7153f45..5779394 100644 --- a/CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch +++ b/CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch @@ -1,14 +1,14 @@ -From f28a0094dc8fe9667f4896e2594e5e1b762e8956 Mon Sep 17 00:00:00 2001 +From 1d8a006504954d64b479160a09317204bfab7a33 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 23 Dec 2013 15:57:57 +1100 Subject: [PATCH] Disable Connected Check on setScoreboard diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 03be384..3fcab5d 100644 +index 1d2a080..5677a9b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1192,7 +1192,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1193,7 +1193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { throw new IllegalStateException("Cannot set scoreboard yet"); } if (playerConnection.isDisconnected()) { @@ -18,5 +18,5 @@ index 03be384..3fcab5d 100644 this.server.getScoreboardManager().setPlayerBoard(this, scoreboard); -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0100-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0100-Implement-Locale-Getter-for-Players.patch index 0590724..492ec69 100644 --- a/CraftBukkit-Patches/0100-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0100-Implement-Locale-Getter-for-Players.patch @@ -1,4 +1,4 @@ -From 0c72b73039ba352ba54357abae4110541b274f42 Mon Sep 17 00:00:00 2001 +From 9cd01b3f2311601709147f261063dfb0a82d3b74 Mon Sep 17 00:00:00 2001 From: Smove Date: Sat, 1 Feb 2014 18:12:16 +1100 Subject: [PATCH] Implement Locale Getter for Players @@ -18,10 +18,10 @@ index c1caca7..ca06f60 100644 public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7a96a3f..23d9612 100644 +index 4c3018a..11599fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1335,6 +1335,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1336,6 +1336,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().playerConnection.sendPacket( packet ); } } @@ -35,5 +35,5 @@ index 7a96a3f..23d9612 100644 public Player.Spigot spigot() -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0105-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0105-Add-support-for-fetching-hidden-players.patch index 558f829..0ccc6f5 100644 --- a/CraftBukkit-Patches/0105-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0105-Add-support-for-fetching-hidden-players.patch @@ -1,14 +1,14 @@ -From 9b9f64c29e0f3ccb457b478c1b7c987022b6651d Mon Sep 17 00:00:00 2001 +From be6adae398e836ab8b44a443eb0f9310d572f1bc Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 9 Feb 2014 14:03:03 -0500 Subject: [PATCH] Add support for fetching hidden players diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 23d9612..f687308 100644 +index 11599fc..b6eac78 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1341,6 +1341,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1342,6 +1342,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { { return getHandle().locale; } @@ -22,5 +22,5 @@ index 23d9612..f687308 100644 public Player.Spigot spigot() -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0107-Cap-Channel-Registrations.patch b/CraftBukkit-Patches/0107-Cap-Channel-Registrations.patch index 77a4ff4..3d52b7d 100644 --- a/CraftBukkit-Patches/0107-Cap-Channel-Registrations.patch +++ b/CraftBukkit-Patches/0107-Cap-Channel-Registrations.patch @@ -1,14 +1,14 @@ -From e512af6b5412f7e32846fa124d3f45536582cf5c Mon Sep 17 00:00:00 2001 +From 449f7d4c3da8968c7f41ad21397657d24fee2ae6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 20:02:58 +1100 Subject: [PATCH] Cap Channel Registrations diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f687308..5d7e77f 100644 +index b6eac78..260502b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1023,6 +1023,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1024,6 +1024,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } public void addChannel(String channel) { @@ -17,5 +17,5 @@ index f687308..5d7e77f 100644 server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel)); } -- -1.8.5.2.msysgit.0 +1.8.3.2