Merge remote-tracking branch 'upstream/master' into 2310-merge

This commit is contained in:
Owain van Brakel
2019-10-30 04:31:10 +01:00

View File

@@ -601,8 +601,7 @@ public class MenuEntrySwapperPlugin extends Plugin
for (final String object : removedObjects) for (final String object : removedObjects)
{ {
if (target.equals(object) if (target.equals(object)
|| hasArrow && target.endsWith(object) || hasArrow && target.endsWith(object))
|| targetLength > object.length() && target.startsWith(object))
{ {
client.setMenuOptionCount(client.getMenuOptionCount() - 1); client.setMenuOptionCount(client.getMenuOptionCount() - 1);
return; return;