From ec95b6efdaf7cfad9990c246be3c65e50e23931c Mon Sep 17 00:00:00 2001 From: Cekis Date: Sat, 4 Feb 2017 18:19:51 +0000 Subject: [PATCH] Fixed issue when trying to remove a guild member that is no longer a part of the guild (i.e. they left already) --- .../compiled/game/script/library/guild.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/library/guild.java diff --git a/sku.0/sys.server/compiled/game/script/library/guild.java b/sku.0/sys.server/compiled/game/script/library/guild.java old mode 100644 new mode 100755 index a02592a6c..a528da577 --- a/sku.0/sys.server/compiled/game/script/library/guild.java +++ b/sku.0/sys.server/compiled/game/script/library/guild.java @@ -831,16 +831,15 @@ public class guild extends script.base_script if (members != null && members.length > 0) { java.util.StringTokenizer st = new java.util.StringTokenizer(name); - String compareName = toLower(st.nextToken()); - for (int i = 0; i < members.length; ++i) - { - if (isIdValid(members[i])) - { - java.util.StringTokenizer st2 = new java.util.StringTokenizer(guildGetMemberName(guildId, members[i])); - String memberName = toLower(st2.nextToken()); - if (compareName.equals(memberName)) - { - return members[i]; + if(st != null && st.hasMoreTokens()) { + String compareName = toLower(st.nextToken()); + for (int i = 0; i < members.length; ++i) { + if (isIdValid(members[i])) { + java.util.StringTokenizer st2 = new java.util.StringTokenizer(guildGetMemberName(guildId, members[i])); + String memberName = toLower(st2.nextToken()); + if (compareName.equals(memberName)) { + return members[i]; + } } } }