Make ::players show everyone, even for non-mods (#406)

This commit is contained in:
Daniel Ginovker
2020-08-03 11:05:45 -04:00
committed by GitHub
parent c1df673033
commit 707783552f
@@ -1,7 +1,9 @@
package com.rebotted.net.packets.impl; package com.rebotted.net.packets.impl;
import static com.rebotted.util.GameLogger.writeLog; import static com.rebotted.util.GameLogger.writeLog;
import java.util.Arrays; import java.util.Arrays;
import com.rebotted.Connection; import com.rebotted.Connection;
import com.rebotted.GameConstants; import com.rebotted.GameConstants;
import com.rebotted.GameEngine; import com.rebotted.GameEngine;
@@ -13,6 +15,7 @@ import com.rebotted.game.players.antimacro.AntiSpam;
import com.rebotted.net.packets.PacketType; import com.rebotted.net.packets.PacketType;
import com.rebotted.util.Misc; import com.rebotted.util.Misc;
import com.rebotted.world.clip.Region; import com.rebotted.world.clip.Region;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
@@ -143,16 +146,16 @@ public class Commands implements PacketType {
} else { } else {
player.getPacketSender().sendMessage("There is currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "player" : "player shop") + " online."); player.getPacketSender().sendMessage("There is currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "player" : "player shop") + " online.");
} }
if (player.playerRights > 0) {
String[] players = new String[count]; String[] players = new String[count];
int playerIndex = 0; int playerIndex = 0;
for (Player _player : PlayerHandler.players) { for (Player _player : PlayerHandler.players) {
if (_player != null) { if (_player != null) {
if (playerCommand.equalsIgnoreCase("players") ? !_player.isBot : _player.isBot) if (playerCommand.equalsIgnoreCase("players") != _player.isBot) {
players[playerIndex++] = _player.properName; players[playerIndex++] = _player.properName;
} }
} }
}
// Clear all lines // Clear all lines
@@ -165,9 +168,7 @@ public class Commands implements PacketType {
player.getPacketSender().sendString(line, playersLineNumber++); player.getPacketSender().sendString(line, playersLineNumber++);
} }
player.getPacketSender().showInterface(8134); player.getPacketSender().showInterface(8134);
break;
}
break; break;
case "prayer": case "prayer":
player.getPacketSender().sendMessage(String.format("Prayer points: %d", player.playerLevel[5])); player.getPacketSender().sendMessage(String.format("Prayer points: %d", player.playerLevel[5]));
@@ -177,14 +178,11 @@ public class Commands implements PacketType {
break; break;
case "snow": case "snow":
Calendar date = new GregorianCalendar(); Calendar date = new GregorianCalendar();
if ((date.get(Calendar.MONTH) + 1) == 12 && !player.inWild()) if ((date.get(Calendar.MONTH) + 1) == 12 && !player.inWild()) {
{ if (player.isSnowy) {
if (player.isSnowy)
{
player.isSnowy = false; player.isSnowy = false;
player.getPacketSender().walkableInterface(-1); player.getPacketSender().walkableInterface(-1);
} } else {
else {
player.isSnowy = true; player.isSnowy = true;
player.getPacketSender().walkableInterface(11877); player.getPacketSender().walkableInterface(11877);
player.getPacketSender().sendMessage("Happy Holidays! Type ::snow to disable/enable! (Auto-disabling in certain area)"); player.getPacketSender().sendMessage("Happy Holidays! Type ::snow to disable/enable! (Auto-disabling in certain area)");
@@ -697,7 +695,8 @@ public class Commands implements PacketType {
player.playerLevel[skill] = player.getPlayerAssistant().getLevelForXP(player.playerXP[skill]); player.playerLevel[skill] = player.getPlayerAssistant().getLevelForXP(player.playerXP[skill]);
player.getPlayerAssistant().refreshSkill(skill); player.getPlayerAssistant().refreshSkill(skill);
player.getPlayerAssistant().levelUp(skill); player.getPlayerAssistant().levelUp(skill);
} catch (Exception e) {} } catch (Exception e) {
}
break; break;
case "spellbook": case "spellbook":
if (player.inWild()) { if (player.inWild()) {
@@ -733,7 +732,8 @@ public class Commands implements PacketType {
} else { } else {
player.getPacketSender().sendMessage("No such item."); player.getPacketSender().sendMessage("No such item.");
} }
} catch (Exception e) {} } catch (Exception e) {
}
break; break;
case "master": case "master":
for (int i = 0; i < 25; i++) { for (int i = 0; i < 25; i++) {
@@ -874,7 +874,8 @@ public class Commands implements PacketType {
} else { } else {
player.getPacketSender().sendMessage("Npc " + newNPC + " does not exist."); player.getPacketSender().sendMessage("Npc " + newNPC + " does not exist.");
} }
} catch (Exception e) {} } catch (Exception e) {
}
break; break;
case "cantattack": case "cantattack":
player.npcCanAttack = !player.npcCanAttack; player.npcCanAttack = !player.npcCanAttack;
@@ -892,7 +893,8 @@ public class Commands implements PacketType {
player.getPacketSender().sendMessage("You must specify an ID: ::tutprog 10"); player.getPacketSender().sendMessage("You must specify an ID: ::tutprog 10");
return; return;
} }
player.tutorialProgress = Integer.parseInt(arguments[0]);; player.tutorialProgress = Integer.parseInt(arguments[0]);
;
break; break;
case "song": case "song":
if (arguments.length == 0) { if (arguments.length == 0) {