2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-07 16:49:07 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Ginovker
2020-08-03 11:05:45 -04:00
committed by GitHub
parent c1df673033
commit 707783552f
1 changed files with 197 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java
+64 -62
View File
@@ -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;
@@ -43,7 +46,7 @@ public class Commands implements PacketType {
public static void playerCommands(Player player, String playerCommand, String[] arguments) { public static void playerCommands(Player player, String playerCommand, String[] arguments) {
switch (playerCommand.toLowerCase()) { switch (playerCommand.toLowerCase()) {
case "hideYell": case "hideYell":
player.hideYell =! player.hideYell; player.hideYell = !player.hideYell;
player.getPacketSender().sendMessage("Your yell visibility preferences have been updated."); player.getPacketSender().sendMessage("Your yell visibility preferences have been updated.");
break; break;
case "yell": case "yell":
@@ -82,7 +85,7 @@ public class Commands implements PacketType {
} }
break; break;
case "claimvote": case "claimvote":
if(!GameEngine.ersSecret.equals("")) { if (!GameEngine.ersSecret.equals("")) {
final String playerName = player.playerName; final String playerName = player.playerName;
com.everythingrs.vote.Vote.service.execute(new Runnable() { com.everythingrs.vote.Vote.service.execute(new Runnable() {
@@ -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
@@ -161,13 +164,11 @@ public class Commands implements PacketType {
player.getPacketSender().sendString("@dre@" + (playerCommand.equalsIgnoreCase("players") ? "Players" : "Player Shops"), 8144); player.getPacketSender().sendString("@dre@" + (playerCommand.equalsIgnoreCase("players") ? "Players" : "Player Shops"), 8144);
int playersLineNumber = 8147; int playersLineNumber = 8147;
for (String line : players){ for (String line : players) {
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)");
@@ -285,7 +283,7 @@ public class Commands implements PacketType {
player.getPacketSender().sendString("@dre@Commands", 8144); player.getPacketSender().sendString("@dre@Commands", 8144);
int commandsLineNumber = 8147; int commandsLineNumber = 8147;
for (String line : commands){ for (String line : commands) {
player.getPacketSender().sendString(line, commandsLineNumber++); player.getPacketSender().sendString(line, commandsLineNumber++);
} }
player.getPacketSender().showInterface(8134); player.getPacketSender().showInterface(8134);
@@ -369,7 +367,7 @@ public class Commands implements PacketType {
player.getPacketSender().sendString("@dre@Highscores", 8144); player.getPacketSender().sendString("@dre@Highscores", 8144);
int highscoresLineNumber = 8147; int highscoresLineNumber = 8147;
for (String line : highscores){ for (String line : highscores) {
player.getPacketSender().sendString(line, highscoresLineNumber++); player.getPacketSender().sendString(line, highscoresLineNumber++);
} }
player.getPacketSender().showInterface(8134); player.getPacketSender().showInterface(8134);
@@ -389,10 +387,10 @@ public class Commands implements PacketType {
return; return;
} }
String playerToKick = String.join(" ", arguments); String playerToKick = String.join(" ", arguments);
for(Player player2 : PlayerHandler.players) { for (Player player2 : PlayerHandler.players) {
if(player2 != null) { if (player2 != null) {
if(player2.playerName.equalsIgnoreCase(playerToKick)) { if (player2.playerName.equalsIgnoreCase(playerToKick)) {
Client c2 = (Client)player2; Client c2 = (Client) player2;
player.getPacketSender().sendMessage("You have kicked " + playerToKick + "."); player.getPacketSender().sendMessage("You have kicked " + playerToKick + ".");
c2.disconnected = true; c2.disconnected = true;
c2.logout(true); c2.logout(true);
@@ -400,7 +398,7 @@ public class Commands implements PacketType {
} }
} }
} }
} catch(Exception e) { } catch (Exception e) {
player.getPacketSender().sendMessage("Player Must Be Online."); player.getPacketSender().sendMessage("Player Must Be Online.");
} }
break; break;
@@ -512,17 +510,17 @@ public class Commands implements PacketType {
return; return;
} }
String playerToBan = String.join(" ", arguments); String playerToBan = String.join(" ", arguments);
for(int i = 0; i < GameConstants.MAX_PLAYERS; i++) { for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if(PlayerHandler.players[i] != null) { if (PlayerHandler.players[i] != null) {
if(PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToBan)) { if (PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToBan)) {
Connection.addIpToBanList(PlayerHandler.players[i].connectedFrom); Connection.addIpToBanList(PlayerHandler.players[i].connectedFrom);
Connection.addIpToFile(PlayerHandler.players[i].connectedFrom); Connection.addIpToFile(PlayerHandler.players[i].connectedFrom);
player.getPacketSender().sendMessage("You have IP banned the user: "+PlayerHandler.players[i].playerName+" with the host: "+PlayerHandler.players[i].connectedFrom); player.getPacketSender().sendMessage("You have IP banned the user: " + PlayerHandler.players[i].playerName + " with the host: " + PlayerHandler.players[i].connectedFrom);
PlayerHandler.players[i].disconnected = true; PlayerHandler.players[i].disconnected = true;
} }
} }
} }
} catch(Exception e) { } catch (Exception e) {
player.getPacketSender().sendMessage("Player Must Be Offline."); player.getPacketSender().sendMessage("Player Must Be Offline.");
} }
break; break;
@@ -535,14 +533,14 @@ public class Commands implements PacketType {
String playerToBan = String.join(" ", arguments); String playerToBan = String.join(" ", arguments);
Connection.addNameToBanList(playerToBan); Connection.addNameToBanList(playerToBan);
Connection.addNameToFile(playerToBan); Connection.addNameToFile(playerToBan);
for(int i = 0; i < GameConstants.MAX_PLAYERS; i++) { for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if(PlayerHandler.players[i] != null) { if (PlayerHandler.players[i] != null) {
if(PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToBan)) { if (PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToBan)) {
PlayerHandler.players[i].disconnected = true; PlayerHandler.players[i].disconnected = true;
} }
} }
} }
} catch(Exception e) { } catch (Exception e) {
player.getPacketSender().sendMessage("Player Must Be Offline."); player.getPacketSender().sendMessage("Player Must Be Offline.");
} }
break; break;
@@ -555,7 +553,7 @@ public class Commands implements PacketType {
String playerToBan = String.join(" ", arguments); String playerToBan = String.join(" ", arguments);
Connection.removeNameFromBanList(playerToBan); Connection.removeNameFromBanList(playerToBan);
player.getPacketSender().sendMessage(playerToBan + " has been unbanned."); player.getPacketSender().sendMessage(playerToBan + " has been unbanned.");
} catch(Exception e) { } catch (Exception e) {
player.getPacketSender().sendMessage("Player Must Be Offline."); player.getPacketSender().sendMessage("Player Must Be Offline.");
} }
break; break;
@@ -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++) {
@@ -749,22 +749,22 @@ public class Commands implements PacketType {
public static void developerCommands(Player player, String playerCommand, String[] arguments) { public static void developerCommands(Player player, String playerCommand, String[] arguments) {
switch (playerCommand.toLowerCase()) { switch (playerCommand.toLowerCase()) {
case "quicksong": case "quicksong":
try{ try {
if (arguments.length == 0) { if (arguments.length == 0) {
player.getPacketSender().sendMessage("You must specify a quick song id: ::quicksong id"); player.getPacketSender().sendMessage("You must specify a quick song id: ::quicksong id");
return; return;
} }
int song = Integer.parseInt(arguments[0]); int song = Integer.parseInt(arguments[0]);
player.getPacketSender().sendQuickSong(song, 2); //delay of 2 to repeat at least once before returning to regular music player.getPacketSender().sendQuickSong(song, 2); //delay of 2 to repeat at least once before returning to regular music
}catch(Exception e) { } catch (Exception e) {
player.getPacketSender().sendMessage("Sound could not be sent."); player.getPacketSender().sendMessage("Sound could not be sent.");
} }
break; break;
case"cameracutscene": case "cameracutscene":
player.getPlayerAssistant().sendCameraCutscene(player.getX(), player.getY(),10,10, 10); //Test numbers player.getPlayerAssistant().sendCameraCutscene(player.getX(), player.getY(), 10, 10, 10); //Test numbers
break; break;
case"camerashake": case "camerashake":
player.getPlayerAssistant().sendCameraShake(1,9,1,9); //these are just test numbers player.getPlayerAssistant().sendCameraShake(1, 9, 1, 9); //these are just test numbers
break; break;
case "camerareset": case "camerareset":
player.getPlayerAssistant().sendCameraReset(); //Resets the camera to the normal player view player.getPlayerAssistant().sendCameraReset(); //Resets the camera to the normal player view
@@ -781,10 +781,10 @@ public class Commands implements PacketType {
return; return;
} }
String playerToAdmin = String.join(" ", arguments); String playerToAdmin = String.join(" ", arguments);
for(int i = 0; i < GameConstants.MAX_PLAYERS; i++) { for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if(PlayerHandler.players[i] != null) { if (PlayerHandler.players[i] != null) {
if(PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToAdmin)) { if (PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToAdmin)) {
Client c2 = (Client)PlayerHandler.players[i]; Client c2 = (Client) PlayerHandler.players[i];
player.getPacketSender().sendMessage("You have given " + playerToAdmin + " admin."); player.getPacketSender().sendMessage("You have given " + playerToAdmin + " admin.");
c2.playerRights = 2; c2.playerRights = 2;
c2.logout(true); c2.logout(true);
@@ -792,7 +792,7 @@ public class Commands implements PacketType {
} }
} }
} }
} catch(Exception e) { } catch (Exception e) {
player.getPacketSender().sendMessage("Player Must Be Offline."); player.getPacketSender().sendMessage("Player Must Be Offline.");
} }
break; break;
@@ -803,10 +803,10 @@ public class Commands implements PacketType {
return; return;
} }
String playerToAdmin = String.join(" ", arguments); String playerToAdmin = String.join(" ", arguments);
for(int i = 0; i < GameConstants.MAX_PLAYERS; i++) { for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if(PlayerHandler.players[i] != null) { if (PlayerHandler.players[i] != null) {
if(PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToAdmin)) { if (PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToAdmin)) {
Client c2 = (Client)PlayerHandler.players[i]; Client c2 = (Client) PlayerHandler.players[i];
player.getPacketSender().sendMessage("You have demoted " + playerToAdmin + "."); player.getPacketSender().sendMessage("You have demoted " + playerToAdmin + ".");
c2.playerRights = 0; c2.playerRights = 0;
c2.logout(true); c2.logout(true);
@@ -814,7 +814,7 @@ public class Commands implements PacketType {
} }
} }
} }
} catch(Exception e) { } catch (Exception e) {
player.getPacketSender().sendMessage("Player Must Be Offline."); player.getPacketSender().sendMessage("Player Must Be Offline.");
} }
break; break;
@@ -825,10 +825,10 @@ public class Commands implements PacketType {
return; return;
} }
String playerToMod = String.join(" ", arguments); String playerToMod = String.join(" ", arguments);
for(int i = 0; i < GameConstants.MAX_PLAYERS; i++) { for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if(PlayerHandler.players[i] != null) { if (PlayerHandler.players[i] != null) {
if(PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToMod)) { if (PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToMod)) {
Client c2 = (Client)PlayerHandler.players[i]; Client c2 = (Client) PlayerHandler.players[i];
player.getPacketSender().sendMessage("You have given " + playerToMod + " mod."); player.getPacketSender().sendMessage("You have given " + playerToMod + " mod.");
c2.playerRights = 1; c2.playerRights = 1;
c2.logout(true); c2.logout(true);
@@ -836,7 +836,7 @@ public class Commands implements PacketType {
} }
} }
} }
} catch(Exception e) { } catch (Exception e) {
player.getPacketSender().sendMessage("Player Must Be Offline."); player.getPacketSender().sendMessage("Player Must Be Offline.");
} }
break; break;
@@ -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) {
@@ -908,11 +910,11 @@ public class Commands implements PacketType {
break; break;
case "runes": case "runes":
final int amount = 10000; final int amount = 10000;
final int[][] RUNES = { { 554, amount }, { 555, amount }, final int[][] RUNES = {{554, amount}, {555, amount},
{ 556, amount }, { 557, amount }, { 558, amount }, {556, amount}, {557, amount}, {558, amount},
{ 559, amount }, { 560, amount }, { 561, amount }, {559, amount}, {560, amount}, {561, amount},
{ 562, amount }, { 563, amount }, { 564, amount }, {562, amount}, {563, amount}, {564, amount},
{ 565, amount }, { 566, amount }, { 1963, 1 }, }; {565, amount}, {566, amount}, {1963, 1},};
for (int[] element : RUNES) { for (int[] element : RUNES) {
int item = element[0]; int item = element[0];
int amountToRecieve = element[1]; int amountToRecieve = element[1];