Revert "clanchat: Add player name to kick message (#11555)"

This reverts commit 41a041972a.

This evidently is intentionally left out of vanilla due to concerns over
triggering auto mutes due to kicking players with bad names.
https://twitter.com/JagexAsh/status/1268620095569289226
This commit is contained in:
Adam
2020-06-04 19:32:15 -04:00
parent 473ab8eae2
commit e8b464f217
3 changed files with 2 additions and 36 deletions

View File

@@ -150,22 +150,11 @@ public interface ClanChatConfig extends Config
return false;
}
@ConfigItem(
keyName = "kickWithName",
name = "Show kicked player",
description = "Changes kick message to say who was kicked",
position = 10
)
default boolean kickWithName()
{
return true;
}
@ConfigItem(
keyName = "showIgnores",
name = "Recolor ignored players",
description = "Recolors players that are on your ignore list",
position = 11
position = 10
)
default boolean showIgnores()
{
@@ -176,7 +165,7 @@ public interface ClanChatConfig extends Config
keyName = "showIgnoresColor",
name = "Ignored color",
description = "Allows you to change the color of the ignored players in your clan chat",
position = 12
position = 11
)
default Color showIgnoresColor()
{

View File

@@ -555,22 +555,6 @@ public class ClanChatPlugin extends Plugin
clientThread.invokeLater(() -> confirmKickPlayer(kickPlayerName));
break;
}
case "sendKickName":
{
if (!config.kickWithName())
{
break;
}
// Get name of the player we are kicking
final String[] stringStack = client.getStringStack();
final int stringSize = client.getStringStackSize();
final String kickPlayerName = stringStack[stringSize - 1];
// Sets the kick message based on players name
stringStack[stringSize - 2] = "-Attempting to kick " + kickPlayerName + " from friends chat...";
break;
}
}
}

View File

@@ -6,9 +6,6 @@
; callback "confirmClanKick"
; Used by the ClanChat plugin to show a chatbox panel confirming the requested kick
; Also requires the "confirmKicks" option of ClanChatConfig to be enabled
; callback "sendKickName"
; Used by the ClanChat plugin to modify the kick message to include player name
; Also requires the "kickWithName" option of ClanChatConfig to be enabled
invoke 1942
iconst 1
if_icmpeq LABEL4
@@ -19,10 +16,6 @@ LABEL4:
return
LABEL7:
sconst "-Attempting to kick player from friends chat..."
sload 0 ; Username we are kicking
sconst "sendKickName"
runelite_callback
pop_string ; Username we are kicking
iconst 2
invoke 96
sload 0