108 lines
5.4 KiB
Diff
108 lines
5.4 KiB
Diff
From af9035b6044147970e4b830a2205ae6301240374 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
Date: Fri, 21 Jun 2013 19:21:58 +1000
|
|
Subject: [PATCH] Configurable Messages
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
|
|
index e5992f8..b80a760 100644
|
|
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
|
|
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
|
|
@@ -64,11 +64,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
|
|
// CraftBukkit end
|
|
|
|
if (packethandshakinginsetprotocol.d() > 4) {
|
|
- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.5");
|
|
+ chatcomponenttext = new ChatComponentText( org.spigotmc.SpigotConfig.outdatedServerMessage ); // Spigot
|
|
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
|
|
this.b.close(chatcomponenttext);
|
|
} else if (packethandshakinginsetprotocol.d() < 4) {
|
|
- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.7.5");
|
|
+ chatcomponenttext = new ChatComponentText( org.spigotmc.SpigotConfig.outdatedClientMessage ); // Spigot
|
|
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
|
|
this.b.close(chatcomponenttext);
|
|
} else {
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
|
index 1fb24f7..38c37c1 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -339,7 +339,7 @@ public abstract class PlayerList {
|
|
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s);
|
|
} else if (!this.isWhitelisted(gameprofile.getName())) {
|
|
// return "You are not white-listed on this server!";
|
|
- event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, "You are not white-listed on this server!");
|
|
+ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot
|
|
} else {
|
|
String s1 = socketaddress.toString();
|
|
|
|
@@ -358,7 +358,7 @@ public abstract class PlayerList {
|
|
} else {
|
|
// return this.players.size() >= this.maxPlayers ? "The server is full!" : null;
|
|
if (this.players.size() >= this.maxPlayers) {
|
|
- event.disallow(PlayerLoginEvent.Result.KICK_FULL, "The server is full!");
|
|
+ event.disallow(PlayerLoginEvent.Result.KICK_FULL, org.spigotmc.SpigotConfig.serverFullMessage); // Spigot
|
|
}
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index f06cac5..76e43ba 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -701,11 +701,7 @@ public final class CraftServer implements Server {
|
|
return true;
|
|
}
|
|
|
|
- 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 20634f1..efcd193 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -12,6 +12,7 @@ import java.util.Map;
|
|
import java.util.logging.Level;
|
|
import net.minecraft.server.MinecraftServer;
|
|
import org.bukkit.Bukkit;
|
|
+import org.bukkit.ChatColor;
|
|
import org.bukkit.command.Command;
|
|
import org.bukkit.configuration.file.YamlConfiguration;
|
|
|
|
@@ -153,4 +154,28 @@ public class SpigotConfig
|
|
}
|
|
tabComplete = getInt( "commands.tab-complete", 0 );
|
|
}
|
|
+
|
|
+ public static String whitelistMessage;
|
|
+ public static String unknownCommandMessage;
|
|
+ public static String serverFullMessage;
|
|
+ public static String outdatedClientMessage = "Outdated client! Please use {}";
|
|
+ public static String outdatedServerMessage = "Outdated server! I\'m still on {0}";
|
|
+ private static String transform(String s)
|
|
+ {
|
|
+ return ChatColor.translateAlternateColorCodes( '&', s ).replaceAll( "\\n", "\n" );
|
|
+ }
|
|
+ private static void messages()
|
|
+ {
|
|
+ if (version < 4)
|
|
+ {
|
|
+ set( "messages.outdated-client", outdatedClientMessage );
|
|
+ set( "messages.outdated-server", outdatedServerMessage );
|
|
+ }
|
|
+
|
|
+ whitelistMessage = transform( getString( "messages.whitelist", "You are not whitelisted on this server!" ) );
|
|
+ unknownCommandMessage = transform( getString( "messages.unknown-command", "Unknown command. Type \"/help\" for help." ) );
|
|
+ serverFullMessage = transform( getString( "messages.server-full", "The server is full!" ) );
|
|
+ outdatedClientMessage = transform( getString( "messages.outdated-client", outdatedClientMessage ) );
|
|
+ outdatedServerMessage = transform( getString( "messages.outdated-server", outdatedServerMessage ) );
|
|
+ }
|
|
}
|
|
--
|
|
1.8.3.2
|
|
|