From 80c8e1ac31cc584f4f3e962fdb6e05813a493929 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 21 Jan 2014 15:32:54 +1100 Subject: [PATCH] Don't disconnect player when we have no vanilla tab completions. --- Bukkit-Patches/0006-BungeeCord-Support.patch | 6 +++--- Bukkit-Patches/0008-Add-Particle-API.patch | 8 ++++---- Bukkit-Patches/0015-Player-Collision-API.patch | 6 +++--- Bukkit-Patches/0018-Add-respawn-API.patch | 6 +++--- ...Allow-for-fallback-commands-to-be-removed.patch | 6 +++--- .../0003-Skeleton-API-Implementations.patch | 6 +++--- .../0033-Implement-SpawnerSpawnEvent.patch | 10 +++++----- .../0048-Player-Collision-API.patch | 6 +++--- .../0052-Cap-Minimum-Player-Speed.patch | 8 ++++---- .../0058-Implement-respawn-API.patch | 6 +++--- CraftBukkit-Patches/0063-BungeeCord-Support.patch | 6 +++--- ...laCommand-Wrapper-to-Support-New-Commands.patch | 14 +++++++++----- ...-Disable-Connected-Check-on-setScoreboard.patch | 8 ++++---- 13 files changed, 50 insertions(+), 46 deletions(-) diff --git a/Bukkit-Patches/0006-BungeeCord-Support.patch b/Bukkit-Patches/0006-BungeeCord-Support.patch index 1c242a9a8..dafd2d4be 100644 --- a/Bukkit-Patches/0006-BungeeCord-Support.patch +++ b/Bukkit-Patches/0006-BungeeCord-Support.patch @@ -1,14 +1,14 @@ -From aed8c09032e9555f06ad01efe79a72e44c0bb3e6 Mon Sep 17 00:00:00 2001 +From 0338bcb97d3daff6160d8ee94e6b8a90e8ee42d0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:20:49 +1000 Subject: [PATCH] BungeeCord Support diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 7aa697d..22bce07 100644 +index 3c096f5..234a82d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -788,4 +788,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1018,4 +1018,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @see Player#setHealthScaled(boolean) */ public double getHealthScale(); diff --git a/Bukkit-Patches/0008-Add-Particle-API.patch b/Bukkit-Patches/0008-Add-Particle-API.patch index 926dd7c39..97557e03a 100644 --- a/Bukkit-Patches/0008-Add-Particle-API.patch +++ b/Bukkit-Patches/0008-Add-Particle-API.patch @@ -1,4 +1,4 @@ -From 4c7701d9ccb11b2412671090f39bfe9eaeee1103 Mon Sep 17 00:00:00 2001 +From 52f16d9f47956b8295dfaccb85cd4738201156cc Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:57:09 +1000 Subject: [PATCH] Add Particle API @@ -327,10 +327,10 @@ index f02bfb7..a58eb05 100644 * Represents various map environment types that a world may be */ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 22bce07..9b4c28f 100644 +index 234a82d..bcfe0f9 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -803,6 +803,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1033,6 +1033,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } @@ -360,5 +360,5 @@ index 08aa71d..5217aec 100644 } } -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/Bukkit-Patches/0015-Player-Collision-API.patch b/Bukkit-Patches/0015-Player-Collision-API.patch index 5f0d1c28b..6b70ad7bc 100644 --- a/Bukkit-Patches/0015-Player-Collision-API.patch +++ b/Bukkit-Patches/0015-Player-Collision-API.patch @@ -1,14 +1,14 @@ -From ea4086f1dab600580f00989f73df0d5ce7926513 Mon Sep 17 00:00:00 2001 +From a786683923823eafeba4fac99c6da728b9795450 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:20:50 +1000 Subject: [PATCH] Player Collision API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9b4c28f..ba0ce2b 100644 +index bcfe0f9..1c80bd2 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -808,6 +808,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1038,6 +1038,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Bukkit-Patches/0018-Add-respawn-API.patch b/Bukkit-Patches/0018-Add-respawn-API.patch index fb8449008..19219ce58 100644 --- a/Bukkit-Patches/0018-Add-respawn-API.patch +++ b/Bukkit-Patches/0018-Add-respawn-API.patch @@ -1,14 +1,14 @@ -From 926cebe2d1f455c7f309ae70e4879c29acbf0e7c Mon Sep 17 00:00:00 2001 +From 0404f576113f57a2c7f605935b5c9296f9a5b0a9 Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:35:58 +0200 Subject: [PATCH] Add respawn API. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ba0ce2b..15481e7 100644 +index 1c80bd2..adef230 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -829,6 +829,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1059,6 +1059,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch b/Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch index 0f99f335d..e163394d1 100644 --- a/Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch +++ b/Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch @@ -1,14 +1,14 @@ -From 9fa22f91e7a72a105765b2a1b512d7c199b03980 Mon Sep 17 00:00:00 2001 +From 7a4e9a52584e1a01c04a7c8cd0d17743f6fd6414 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 18 Dec 2013 10:19:50 +1100 Subject: [PATCH] Allow for fallback commands to be removed. diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index d178ad0..8dafd02 100644 +index 9ae0bce..53c9207 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java -@@ -332,4 +332,18 @@ public class SimpleCommandMap implements CommandMap { +@@ -333,4 +333,18 @@ public class SimpleCommandMap implements CommandMap { } } } diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index 70eb9d540..84284d1f0 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 40711385ca8b77d9ab8417823549dfd7eb8d66ee Mon Sep 17 00:00:00 2001 +From ca8e45f5c2141df3b4d582b22662715a2f1fffe1 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 33169e2..83f51ab 100644 +index 9935e7a..6b7fcfc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1128,4 +1128,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1254,4 +1254,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } collection.add(new AttributeModifiable(getHandle().bc(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true))); } diff --git a/CraftBukkit-Patches/0033-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0033-Implement-SpawnerSpawnEvent.patch index d5b5be911..9760a6a05 100644 --- a/CraftBukkit-Patches/0033-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0033-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 454beaba6139be7b6f789ccef11ba7b979bf76a2 Mon Sep 17 00:00:00 2001 +From 851e8e213cfb8cc2fb0e9ceb2c1499cba7ac398e Mon Sep 17 00:00:00 2001 From: Andy Shulman Date: Mon, 15 Apr 2013 20:06:37 -0500 Subject: [PATCH] Implement SpawnerSpawnEvent. @@ -63,18 +63,18 @@ index 67c3397..bb6b3d5 100644 return entity; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a654a3e..f100884 100644 +index a91ffb1..161506a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -35,6 +35,7 @@ import org.bukkit.Server; +@@ -36,6 +36,7 @@ import org.bukkit.Statistic.Type; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.BlockState; +import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.CraftServer; + import org.bukkit.craftbukkit.CraftStatistic; import org.bukkit.craftbukkit.CraftWorld; - import org.bukkit.craftbukkit.block.CraftBlock; -@@ -116,6 +117,22 @@ public class CraftEventFactory { +@@ -120,6 +121,22 @@ public class CraftEventFactory { } /** diff --git a/CraftBukkit-Patches/0048-Player-Collision-API.patch b/CraftBukkit-Patches/0048-Player-Collision-API.patch index 16f9f2336..620a9a2cc 100644 --- a/CraftBukkit-Patches/0048-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0048-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From 68334afca622af9d677803abc524354578d9080d Mon Sep 17 00:00:00 2001 +From 89e3c3a7a4e8cc1e69644153bc8096741b54d29a 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 4945955..ab39926 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 ef74879..06b13c3 100644 +index 2542d56..eaffcdc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1133,6 +1133,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1259,6 +1259,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Spigot start private final Player.Spigot spigot = new Player.Spigot() { diff --git a/CraftBukkit-Patches/0052-Cap-Minimum-Player-Speed.patch b/CraftBukkit-Patches/0052-Cap-Minimum-Player-Speed.patch index 52e941d39..9f245f0a4 100644 --- a/CraftBukkit-Patches/0052-Cap-Minimum-Player-Speed.patch +++ b/CraftBukkit-Patches/0052-Cap-Minimum-Player-Speed.patch @@ -1,14 +1,14 @@ -From 77212e3c7b4c7ac40f09231b50f500a97c351a71 Mon Sep 17 00:00:00 2001 +From cb4ca52b7b0ed594cdd756bfb5a92ac0ee09c8e8 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 06b13c3..3524bce 100644 +index eaffcdc..22fc18f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1005,7 +1005,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1131,7 +1131,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setFlySpeed(float value) { validateSpeed(value); EntityPlayer player = getHandle(); @@ -17,7 +17,7 @@ index 06b13c3..3524bce 100644 player.updateAbilities(); } -@@ -1013,7 +1013,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1139,7 +1139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setWalkSpeed(float value) { validateSpeed(value); EntityPlayer player = getHandle(); diff --git a/CraftBukkit-Patches/0058-Implement-respawn-API.patch b/CraftBukkit-Patches/0058-Implement-respawn-API.patch index 31f5fa2b0..3384784bf 100644 --- a/CraftBukkit-Patches/0058-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0058-Implement-respawn-API.patch @@ -1,14 +1,14 @@ -From b1261bb08a438cebd8333b7e3bb2f3ce5ef0799e Mon Sep 17 00:00:00 2001 +From 7c1f3f5c3c8f474d3ab2bbc112e8395250408401 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 3524bce..52c75f0 100644 +index 22fc18f..5219468 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1146,6 +1146,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1272,6 +1272,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().collidesWithEntities = collides; getHandle().l = collides; // First boolean of Entity } diff --git a/CraftBukkit-Patches/0063-BungeeCord-Support.patch b/CraftBukkit-Patches/0063-BungeeCord-Support.patch index f5802aaaa..12ee0fc91 100644 --- a/CraftBukkit-Patches/0063-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0063-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From c0438ee1849ff6e595d6c7f833527dc8226b3b95 Mon Sep 17 00:00:00 2001 +From 17804fab38de30d2b74e7e4fb7787db24e497de3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -82,10 +82,10 @@ index 8f829bb..6b2fbb9 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 52c75f0..23b4112 100644 +index 5219468..3c17e2f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1135,6 +1135,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1261,6 +1261,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { { @Override diff --git a/CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch b/CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch index 8dd5d8d7c..2d493040d 100644 --- a/CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch +++ b/CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch @@ -1,4 +1,4 @@ -From e9731cbc6edf8f3d913c9cd54e87da240ccb67cf Mon Sep 17 00:00:00 2001 +From 1e8478189ab8e3c19971d100eeb66ea74625a5e3 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 18 Dec 2013 10:32:15 +1100 Subject: [PATCH] Add VanillaCommand Wrapper to Support New Commands @@ -32,7 +32,7 @@ index e63f17c..e58be15 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0ac8f52..fb346f6 100644 +index 0ac8f52..1648d0e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -548,6 +548,12 @@ public final class CraftServer implements Server { @@ -48,7 +48,7 @@ index 0ac8f52..fb346f6 100644 sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage); -@@ -1403,15 +1409,23 @@ public final class CraftServer implements Server { +@@ -1403,15 +1409,27 @@ public final class CraftServer implements Server { } // Spigot End @@ -63,7 +63,11 @@ index 0ac8f52..fb346f6 100644 + { + completions.addAll( bukkitCompletions ); + } -+ completions.addAll( org.spigotmc.VanillaCommandWrapper.complete( player, message ) ); ++ List vanillaCompletions = org.spigotmc.VanillaCommandWrapper.complete( player, message ); ++ if ( vanillaCompletions != null ) ++ { ++ completions.addAll( vanillaCompletions ); ++ } + // Spigot End } catch (CommandException ex) { player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command"); @@ -314,5 +318,5 @@ index 0000000..a6c76cc + } +} -- -1.8.4.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0083-Disable-Connected-Check-on-setScoreboard.patch b/CraftBukkit-Patches/0083-Disable-Connected-Check-on-setScoreboard.patch index 357b0d947..66cee2631 100644 --- a/CraftBukkit-Patches/0083-Disable-Connected-Check-on-setScoreboard.patch +++ b/CraftBukkit-Patches/0083-Disable-Connected-Check-on-setScoreboard.patch @@ -1,14 +1,14 @@ -From 3a9abdf9814017446d83a3267a6f70ae4163e7c7 Mon Sep 17 00:00:00 2001 +From d5c1d277f9e2290c11a3d43033e0789a38f7bb4a 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 3c8b9b9..331ff29 100644 +index 4fa4142..b130951 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1068,7 +1068,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1194,7 +1194,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { throw new IllegalStateException("Cannot set scoreboard yet"); } if (playerConnection.isDisconnected()) { @@ -18,5 +18,5 @@ index 3c8b9b9..331ff29 100644 this.server.getScoreboardManager().setPlayerBoard(this, scoreboard); -- -1.8.4.msysgit.0 +1.8.3.2