19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
21 lines
995 B
Diff
21 lines
995 B
Diff
From 1504ad83eab2228b25ac55319678fac7f3984354 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <git@md-5.net>
|
|
Date: Mon, 14 Apr 2014 17:21:24 +1000
|
|
Subject: [PATCH] Check for blank OfflinePlayer Names
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 55658b6..19b0c4d 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -1274,6 +1274,7 @@ public final class CraftServer implements Server {
|
|
@Deprecated
|
|
public OfflinePlayer getOfflinePlayer(String name) {
|
|
Validate.notNull(name, "Name cannot be null");
|
|
+ com.google.common.base.Preconditions.checkArgument( !org.apache.commons.lang.StringUtils.isBlank( name ), "Name cannot be blank" ); // Spigot
|
|
|
|
// If the name given cannot ever be a valid username give a dummy return, for scoreboard plugins
|
|
if (!validUserPattern.matcher(name).matches()) {
|
|
--
|
|
2.1.0
|
|
|