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:
@@ -150,22 +150,11 @@ public interface ClanChatConfig extends Config
|
|||||||
return false;
|
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(
|
@ConfigItem(
|
||||||
keyName = "showIgnores",
|
keyName = "showIgnores",
|
||||||
name = "Recolor ignored players",
|
name = "Recolor ignored players",
|
||||||
description = "Recolors players that are on your ignore list",
|
description = "Recolors players that are on your ignore list",
|
||||||
position = 11
|
position = 10
|
||||||
)
|
)
|
||||||
default boolean showIgnores()
|
default boolean showIgnores()
|
||||||
{
|
{
|
||||||
@@ -176,7 +165,7 @@ public interface ClanChatConfig extends Config
|
|||||||
keyName = "showIgnoresColor",
|
keyName = "showIgnoresColor",
|
||||||
name = "Ignored color",
|
name = "Ignored color",
|
||||||
description = "Allows you to change the color of the ignored players in your clan chat",
|
description = "Allows you to change the color of the ignored players in your clan chat",
|
||||||
position = 12
|
position = 11
|
||||||
)
|
)
|
||||||
default Color showIgnoresColor()
|
default Color showIgnoresColor()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -555,22 +555,6 @@ public class ClanChatPlugin extends Plugin
|
|||||||
clientThread.invokeLater(() -> confirmKickPlayer(kickPlayerName));
|
clientThread.invokeLater(() -> confirmKickPlayer(kickPlayerName));
|
||||||
break;
|
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,6 @@
|
|||||||
; callback "confirmClanKick"
|
; callback "confirmClanKick"
|
||||||
; Used by the ClanChat plugin to show a chatbox panel confirming the requested kick
|
; Used by the ClanChat plugin to show a chatbox panel confirming the requested kick
|
||||||
; Also requires the "confirmKicks" option of ClanChatConfig to be enabled
|
; 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
|
invoke 1942
|
||||||
iconst 1
|
iconst 1
|
||||||
if_icmpeq LABEL4
|
if_icmpeq LABEL4
|
||||||
@@ -19,10 +16,6 @@ LABEL4:
|
|||||||
return
|
return
|
||||||
LABEL7:
|
LABEL7:
|
||||||
sconst "-Attempting to kick player from friends chat..."
|
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
|
iconst 2
|
||||||
invoke 96
|
invoke 96
|
||||||
sload 0
|
sload 0
|
||||||
|
|||||||
Reference in New Issue
Block a user