By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-19 21:07:42 +10:00
parent acde9aa408
commit 09f1566b74
3 changed files with 39 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
From bdb32d91ed3c63d9592aab483640c795828e8a6b Mon Sep 17 00:00:00 2001
From 7c45fcce863877c76d52a4878aa9ccacc37b24b9 Mon Sep 17 00:00:00 2001
From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
Date: Sun, 14 Apr 2013 21:19:57 +0500
Subject: [PATCH] Prevent handshake spam from invalid names.
@@ -25,7 +25,7 @@ index 343af93..aa6609b 100644
public void a(DataOutputStream dataoutputstream) throws IOException { // CraftBukkit - throws IOException
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 504bd8b..ff28a99 100644
index 504bd8b..2bb9664 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -9,6 +9,8 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -41,7 +41,7 @@ index 504bd8b..ff28a99 100644
private static Metrics metrics;
public static List<String> bungeeIPs;
public static int textureResolution = 16;
+ public static final Pattern validName = Pattern.compile("^[a-zA-Z0-9_]{2,16}$");
+ public static final Pattern validName = Pattern.compile("^[a-zA-Z0-9_-]{2,16}$");
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));