diff --git a/Bukkit b/Bukkit index dd0aa63021..02f2b5e290 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit dd0aa63021567282617f39134b5294523666eb83 +Subproject commit 02f2b5e2907ec978bd35c4d410e5f5aec1bb9587 diff --git a/Bukkit-Patches/0006-BungeeCord-Support.patch b/Bukkit-Patches/0006-BungeeCord-Support.patch index 0181275f59..4d837da884 100644 --- a/Bukkit-Patches/0006-BungeeCord-Support.patch +++ b/Bukkit-Patches/0006-BungeeCord-Support.patch @@ -1,14 +1,14 @@ -From b1bf254e16c2dc76aaf59033d7e1645a6bc19ccf Mon Sep 17 00:00:00 2001 +From 3d516b27d9367638b399b7f0ee038bca72bdba2f 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 3b58d12..0519c55 100644 +index d492790..8402be7 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -691,4 +691,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -705,4 +705,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 f345bf3700..117cfec1d1 100644 --- a/Bukkit-Patches/0008-Add-Particle-API.patch +++ b/Bukkit-Patches/0008-Add-Particle-API.patch @@ -1,4 +1,4 @@ -From 8a68a3ace4aac7d385184dbd10b33140dcc8be60 Mon Sep 17 00:00:00 2001 +From 3210cbac122199792cd0215e413c8a6b10c55f76 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:57:09 +1000 Subject: [PATCH] Add Particle API @@ -320,10 +320,10 @@ index e14fe40..9ae9b2d 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 0519c55..d602594 100644 +index 8402be7..a809f18 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -706,6 +706,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -720,6 +720,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Bukkit-Patches/0012-Console-Command-Completion.patch b/Bukkit-Patches/0012-Console-Command-Completion.patch index 986f0461bd..ea813d4cfb 100644 --- a/Bukkit-Patches/0012-Console-Command-Completion.patch +++ b/Bukkit-Patches/0012-Console-Command-Completion.patch @@ -1,4 +1,4 @@ -From a9d4188a487013c7dd5602f6a22d967035820cdd Mon Sep 17 00:00:00 2001 +From f9a4d23f040aa2b30d09b6e563fb90a87c85731a Mon Sep 17 00:00:00 2001 From: Phillip Schichtel Date: Mon, 29 Apr 2013 23:07:42 +0200 Subject: [PATCH] Console Command Completion @@ -35,7 +35,7 @@ index 5416c71..2f189ca 100644 } } diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index df5f6ef..4c3e421 100644 +index f567dc0..f716782 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -16,6 +16,7 @@ import java.util.regex.Pattern; @@ -46,7 +46,7 @@ index df5f6ef..4c3e421 100644 import org.bukkit.util.StringUtil; public class SimpleCommandMap implements CommandMap { -@@ -224,6 +225,8 @@ public class SimpleCommandMap implements CommandMap { +@@ -226,6 +227,8 @@ public class SimpleCommandMap implements CommandMap { ArrayList completions = new ArrayList(); Map knownCommands = this.knownCommands; @@ -55,7 +55,7 @@ index df5f6ef..4c3e421 100644 for (VanillaCommand command : fallbackCommands) { String name = command.getName(); -@@ -239,7 +242,7 @@ public class SimpleCommandMap implements CommandMap { +@@ -241,7 +244,7 @@ public class SimpleCommandMap implements CommandMap { continue; } @@ -64,7 +64,7 @@ index df5f6ef..4c3e421 100644 } for (Map.Entry commandEntry : knownCommands.entrySet()) { -@@ -252,7 +255,7 @@ public class SimpleCommandMap implements CommandMap { +@@ -254,7 +257,7 @@ public class SimpleCommandMap implements CommandMap { String name = commandEntry.getKey(); // Use the alias, not command name if (StringUtil.startsWithIgnoreCase(name, cmdLine)) { diff --git a/CraftBukkit b/CraftBukkit index 64d45a2fdd..3b7c805621 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 64d45a2fddf6c0c27b52f4badae057c81c55f720 +Subproject commit 3b7c805621236a7386a9ffb38d907ee059caf845 diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index e15bbc6d96..9977ccee8e 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 625173b0a71830d89ebbef0f8c23dd0dae985b57 Mon Sep 17 00:00:00 2001 +From 7b618f9868a803abda53983e73d886de6e67987d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -43,10 +43,10 @@ index b46b9c4..c91b12c 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 fd73856..25deaa9 100644 +index d5d43c9..3e42b91 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1065,4 +1065,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1072,4 +1072,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } collection.add(new AttributeModifiable(getHandle().aW(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true))); } diff --git a/CraftBukkit-Patches/0004-Spigot-Configuration.patch b/CraftBukkit-Patches/0004-Spigot-Configuration.patch index f1e38e0a72..0c0c28dbc2 100644 --- a/CraftBukkit-Patches/0004-Spigot-Configuration.patch +++ b/CraftBukkit-Patches/0004-Spigot-Configuration.patch @@ -1,4 +1,4 @@ -From 8e3b5b89cf6f0c18fae11f27e178f4e0731914a6 Mon Sep 17 00:00:00 2001 +From 12a4f7540086aa7e67d953bdc5a18cfed30414f7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Jul 2013 09:32:53 +1000 Subject: [PATCH] Spigot Configuration @@ -54,7 +54,7 @@ index 0435ca7..7d4def3 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 00326c1..8148f9b 100644 +index 4e74760..44af717 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -214,8 +214,10 @@ public final class CraftServer implements Server { @@ -70,7 +70,7 @@ index 00326c1..8148f9b 100644 } private File getConfigFile() { -@@ -556,6 +558,7 @@ public final class CraftServer implements Server { +@@ -560,6 +562,7 @@ public final class CraftServer implements Server { playerList.getIPBans().load(); playerList.getNameBans().load(); @@ -78,7 +78,7 @@ index 00326c1..8148f9b 100644 for (WorldServer world : console.worlds) { world.difficulty = difficulty; world.setSpawnFlags(monsters, animals); -@@ -570,11 +573,13 @@ public final class CraftServer implements Server { +@@ -574,11 +577,13 @@ public final class CraftServer implements Server { } else { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } diff --git a/CraftBukkit-Patches/0012-Async-Operation-Catching.patch b/CraftBukkit-Patches/0012-Async-Operation-Catching.patch index b3bec2d440..73fa118cf6 100644 --- a/CraftBukkit-Patches/0012-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0012-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From d44ba655f20564580bf309ee402fb17e04224152 Mon Sep 17 00:00:00 2001 +From 02576518418792080a11f4f648156fb819ae1c72 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 7 Mar 2013 20:12:46 +1100 Subject: [PATCH] Async Operation Catching @@ -26,7 +26,7 @@ index 1d9203b..ebbef6a 100644 EntityPlayer entityplayer = (EntityPlayer) entity; Iterator iterator = this.b.iterator(); diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 2a9dd2c..8c35cfe 100644 +index 43fcba0..ce4e2ee 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -297,6 +297,7 @@ public class EntityTrackerEntry { @@ -37,7 +37,7 @@ index 2a9dd2c..8c35cfe 100644 if (entityplayer != this.tracker) { double d0 = entityplayer.locX - (double) (this.xLoc / 32); double d1 = entityplayer.locZ - (double) (this.zLoc / 32); -@@ -503,6 +504,7 @@ public class EntityTrackerEntry { +@@ -507,6 +508,7 @@ public class EntityTrackerEntry { } public void clear(EntityPlayer entityplayer) { @@ -102,7 +102,7 @@ index 8881878..e8bb8ae 100644 if (generate) { // Use the default variant of loadChunk when generate == true. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 25deaa9..360d45c 100644 +index 3e42b91..6e9834f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -218,6 +218,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0029-BungeeCord-Support.patch b/CraftBukkit-Patches/0029-BungeeCord-Support.patch index 6a19bc3d74..aeb8673d08 100644 --- a/CraftBukkit-Patches/0029-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0029-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From c8169d9a04a7ee9d4d4710633f5e5bdbcf8ec667 Mon Sep 17 00:00:00 2001 +From 55ea05602e8a83d38f8bf38c05a76fbb42c8fac6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 11:15:11 +1100 Subject: [PATCH] BungeeCord Support @@ -59,10 +59,10 @@ index f87ebf9..f5032be 100644 event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage()); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 360d45c..b956dee 100644 +index 6e9834f..29fcdfb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1070,6 +1070,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1077,6 +1077,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Spigot start private final Spigot spigot = new Spigot() { @@ -75,7 +75,7 @@ index 360d45c..b956dee 100644 public Spigot spigot() diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 736ba25..9a45d86 100644 +index e5a09b3..a598954 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -7,6 +7,7 @@ import java.lang.reflect.InvocationTargetException; diff --git a/CraftBukkit-Patches/0034-Close-Unloaded-Save-Files.patch b/CraftBukkit-Patches/0034-Close-Unloaded-Save-Files.patch index be5aa8136c..4a2e59ecee 100644 --- a/CraftBukkit-Patches/0034-Close-Unloaded-Save-Files.patch +++ b/CraftBukkit-Patches/0034-Close-Unloaded-Save-Files.patch @@ -1,4 +1,4 @@ -From 9c54993363219359145b596b3884587daebc8906 Mon Sep 17 00:00:00 2001 +From a6d2fbd57b8702a43a660b1360d0c3f442c02816 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Wed, 27 Mar 2013 01:41:54 +0200 Subject: [PATCH] Close Unloaded Save Files @@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644 public static synchronized RegionFile a(File file1, int i, int j) { File file2 = new File(file1, "region"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8148f9b..3addae3 100644 +index 44af717..e65c752 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -37,6 +37,8 @@ import net.minecraft.server.MinecraftServer; @@ -30,7 +30,7 @@ index 8148f9b..3addae3 100644 import net.minecraft.server.ServerNBTManager; import net.minecraft.server.WorldLoaderServer; import net.minecraft.server.WorldManager; -@@ -813,6 +815,30 @@ public final class CraftServer implements Server { +@@ -817,6 +819,30 @@ public final class CraftServer implements Server { worlds.remove(world.getName().toLowerCase()); console.worlds.remove(console.worlds.indexOf(handle)); diff --git a/CraftBukkit-Patches/0039-Particle-API.patch b/CraftBukkit-Patches/0039-Particle-API.patch index 6c96dbfc42..1795e454b8 100644 --- a/CraftBukkit-Patches/0039-Particle-API.patch +++ b/CraftBukkit-Patches/0039-Particle-API.patch @@ -1,4 +1,4 @@ -From 6650757fd8a8979912ac0c9063723e3052aafd3d Mon Sep 17 00:00:00 2001 +From 3e11089e5462b526055fe72958159aced12cac6f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 16:14:30 +1000 Subject: [PATCH] Particle API @@ -152,10 +152,10 @@ index e8bb8ae..a68169f 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 b956dee..ce810c0 100644 +index 29fcdfb..3231226 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -270,13 +270,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -277,13 +277,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().playerConnection.sendPacket(packet); } @@ -173,7 +173,7 @@ index b956dee..ce810c0 100644 public void playEffect(Location loc, Effect effect, T data) { if (data != null) { -@@ -284,9 +282,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -291,9 +289,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } else { Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); } @@ -191,7 +191,7 @@ index b956dee..ce810c0 100644 } public void sendBlockChange(Location loc, Material material, byte data) { -@@ -1075,6 +1078,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1082,6 +1085,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { { return ( getHandle().playerConnection == null ) ? null : (InetSocketAddress) getHandle().playerConnection.networkManager.getSocket().getRemoteSocketAddress(); } diff --git a/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch b/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch index 0b3e7286d9..c40711cf02 100644 --- a/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch +++ b/CraftBukkit-Patches/0044-Do-Not-Search-for-Offline-Players.patch @@ -1,4 +1,4 @@ -From 59f61694395558bf97da4192abea0b02099f0414 Mon Sep 17 00:00:00 2001 +From 11737192759a711cb1692aadb207692b3f003f91 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 16 Jun 2013 08:20:26 +1000 Subject: [PATCH] Do Not Search for Offline Players @@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3addae3..a1fe1f2 100644 +index e65c752..389f80e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1090,7 +1090,7 @@ public final class CraftServer implements Server { +@@ -1094,7 +1094,7 @@ public final class CraftServer implements Server { } public OfflinePlayer getOfflinePlayer(String name) { diff --git a/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch index 6ae21cbc9d..d030849fab 100644 --- a/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch +++ b/CraftBukkit-Patches/0048-Allow-Disabling-of-Command-TabComplete.patch @@ -1,14 +1,14 @@ -From b732df22b226d93edbe2f508d50c0124565b2821 Mon Sep 17 00:00:00 2001 +From 0609e78093f3d90c3cffe1c7592b3260b4283244 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 18:05:54 +1000 Subject: [PATCH] Allow Disabling of Command TabComplete diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a1fe1f2..f356538 100644 +index 389f80e..267605b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1357,7 +1357,7 @@ public final class CraftServer implements Server { +@@ -1361,7 +1361,7 @@ public final class CraftServer implements Server { public List tabCompleteCommand(Player player, String message) { List completions = null; try { @@ -18,7 +18,7 @@ index a1fe1f2..f356538 100644 player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command"); getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex); diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index d64eb0b..e1b8fc0 100644 +index a1fb71f..85369ed 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -240,4 +240,10 @@ public class SpigotConfig diff --git a/CraftBukkit-Patches/0049-Configurable-Messages.patch b/CraftBukkit-Patches/0049-Configurable-Messages.patch index d460a2bc26..84cbb4154f 100644 --- a/CraftBukkit-Patches/0049-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0049-Configurable-Messages.patch @@ -1,11 +1,11 @@ -From 0d94faf97bf904cbac94131787bf01974ae58f64 Mon Sep 17 00:00:00 2001 +From 728f823b45af1acf6d6d8a793422efe5b79001a6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 16df7ae..79c3b98 100644 +index 38e0c5b..262682d 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -309,7 +309,7 @@ public abstract class PlayerList { @@ -27,20 +27,24 @@ index 16df7ae..79c3b98 100644 event.disallow(PlayerLoginEvent.Result.ALLOWED, s2); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f356538..100396f 100644 +index 267605b..100396f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -528,7 +528,7 @@ public final class CraftServer implements Server { +@@ -528,11 +528,7 @@ public final class CraftServer implements Server { return true; } -- sender.sendMessage("Unknown command. Type \"help\" for help."); +- if (sender instanceof Player) { +- sender.sendMessage("Unknown command. Type \"/help\" for help."); +- } else { +- sender.sendMessage("Unknown command. Type \"help\" for help."); +- } + sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage); return false; } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index e1b8fc0..106b392 100644 +index 85369ed..67603b3 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -15,6 +15,7 @@ import java.util.Map; @@ -66,7 +70,7 @@ index e1b8fc0..106b392 100644 + private static void messages() + { + whitelistMessage = transform( getString( "messages.whitelist", "You are not whitelisted on this server!" ) ); -+ unknownCommandMessage = transform( getString( "messages.unknown-command", "Unknown command. Type \"help\" for help." ) ); ++ unknownCommandMessage = transform( getString( "messages.unknown-command", "Unknown command. Type \"/help\" for help." ) ); + serverFullMessage = transform( getString( "messages.server-full", "The server is full!" ) ); + } } diff --git a/CraftBukkit-Patches/0051-Add-Log-Filtering.patch b/CraftBukkit-Patches/0051-Add-Log-Filtering.patch index 3ac8bc78bb..f35a3c05fe 100644 --- a/CraftBukkit-Patches/0051-Add-Log-Filtering.patch +++ b/CraftBukkit-Patches/0051-Add-Log-Filtering.patch @@ -1,4 +1,4 @@ -From 28a75384a6b40fa9a6d1451bcbe3f5351ca3e39d Mon Sep 17 00:00:00 2001 +From aacbd4f9062073b65ce0146664f29bab64b26c3f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 22 Jun 2013 16:40:11 +1000 Subject: [PATCH] Add Log Filtering @@ -35,7 +35,7 @@ index 0000000..aa7e9ab + } +} diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 106b392..c2d033c 100644 +index 67603b3..ea17712 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -13,6 +13,8 @@ import java.util.HashMap; @@ -48,7 +48,7 @@ index 106b392..c2d033c 100644 import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -261,4 +263,27 @@ public class SpigotConfig - unknownCommandMessage = transform( getString( "messages.unknown-command", "Unknown command. Type \"help\" for help." ) ); + unknownCommandMessage = transform( getString( "messages.unknown-command", "Unknown command. Type \"/help\" for help." ) ); serverFullMessage = transform( getString( "messages.server-full", "The server is full!" ) ); } +