2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-10-01 02:17:17 +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;
import static com.rebotted.util.GameLogger.writeLog;
import java.util.Arrays;
import com.rebotted.Connection;
import com.rebotted.GameConstants;
import com.rebotted.GameEngine;
@@ -13,6 +15,7 @@ import com.rebotted.game.players.antimacro.AntiSpam;
import com.rebotted.net.packets.PacketType;
import com.rebotted.util.Misc;
import com.rebotted.world.clip.Region;
import java.util.Calendar;
import java.util.GregorianCalendar;
@@ -43,7 +46,7 @@ public class Commands implements PacketType {
public static void playerCommands(Player player, String playerCommand, String[] arguments) {
switch (playerCommand.toLowerCase()) {
case "hideYell":
player.hideYell =! player.hideYell;
player.hideYell = !player.hideYell;
player.getPacketSender().sendMessage("Your yell visibility preferences have been updated.");
break;
case "yell":
@@ -82,7 +85,7 @@ public class Commands implements PacketType {
}
break;
case "claimvote":
if(!GameEngine.ersSecret.equals("")) {
if (!GameEngine.ersSecret.equals("")) {
final String playerName = player.playerName;
com.everythingrs.vote.Vote.service.execute(new Runnable() {
@@ -143,16 +146,16 @@ public class Commands implements PacketType {
} else {
player.getPacketSender().sendMessage("There is currently " + count + " " + (playerCommand.equalsIgnoreCase("players") ? "player" : "player shop") + " online.");
}
if (player.playerRights > 0) {
String[] players = new String[count];
int playerIndex = 0;
for(Player _player : PlayerHandler.players) {
if(_player != null) {
if (playerCommand.equalsIgnoreCase("players") ? !_player.isBot : _player.isBot)
for (Player _player : PlayerHandler.players) {
if (_player != null) {
if (playerCommand.equalsIgnoreCase("players") != _player.isBot) {
players[playerIndex++] = _player.properName;
}
}
}
// Clear all lines
@@ -161,13 +164,11 @@ public class Commands implements PacketType {
player.getPacketSender().sendString("@dre@" + (playerCommand.equalsIgnoreCase("players") ? "Players" : "Player Shops"), 8144);
int playersLineNumber = 8147;
for (String line : players){
for (String line : players) {
player.getPacketSender().sendString(line, playersLineNumber++);
}
player.getPacketSender().showInterface(8134);
break;
}
break;
case "prayer":
player.getPacketSender().sendMessage(String.format("Prayer points: %d", player.playerLevel[5]));
@@ -177,14 +178,11 @@ public class Commands implements PacketType {
break;
case "snow":
Calendar date = new GregorianCalendar();
if ((date.get(Calendar.MONTH) + 1) == 12 && !player.inWild())
{
if (player.isSnowy)
{
if ((date.get(Calendar.MONTH) + 1) == 12 && !player.inWild()) {
if (player.isSnowy) {
player.isSnowy = false;
player.getPacketSender().walkableInterface(-1);
}
else {
} else {
player.isSnowy = true;
player.getPacketSender().walkableInterface(11877);
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);
int commandsLineNumber = 8147;
for (String line : commands){
for (String line : commands) {
player.getPacketSender().sendString(line, commandsLineNumber++);
}
player.getPacketSender().showInterface(8134);
@@ -369,7 +367,7 @@ public class Commands implements PacketType {
player.getPacketSender().sendString("@dre@Highscores", 8144);
int highscoresLineNumber = 8147;
for (String line : highscores){
for (String line : highscores) {
player.getPacketSender().sendString(line, highscoresLineNumber++);
}
player.getPacketSender().showInterface(8134);
@@ -389,10 +387,10 @@ public class Commands implements PacketType {
return;
}
String playerToKick = String.join(" ", arguments);
for(Player player2 : PlayerHandler.players) {
if(player2 != null) {
if(player2.playerName.equalsIgnoreCase(playerToKick)) {
Client c2 = (Client)player2;
for (Player player2 : PlayerHandler.players) {
if (player2 != null) {
if (player2.playerName.equalsIgnoreCase(playerToKick)) {
Client c2 = (Client) player2;
player.getPacketSender().sendMessage("You have kicked " + playerToKick + ".");
c2.disconnected = 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.");
}
break;
@@ -512,17 +510,17 @@ public class Commands implements PacketType {
return;
}
String playerToBan = String.join(" ", arguments);
for(int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if(PlayerHandler.players[i] != null) {
if(PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToBan)) {
for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if (PlayerHandler.players[i] != null) {
if (PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToBan)) {
Connection.addIpToBanList(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;
}
}
}
} catch(Exception e) {
} catch (Exception e) {
player.getPacketSender().sendMessage("Player Must Be Offline.");
}
break;
@@ -535,14 +533,14 @@ public class Commands implements PacketType {
String playerToBan = String.join(" ", arguments);
Connection.addNameToBanList(playerToBan);
Connection.addNameToFile(playerToBan);
for(int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if(PlayerHandler.players[i] != null) {
if(PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToBan)) {
for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if (PlayerHandler.players[i] != null) {
if (PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToBan)) {
PlayerHandler.players[i].disconnected = true;
}
}
}
} catch(Exception e) {
} catch (Exception e) {
player.getPacketSender().sendMessage("Player Must Be Offline.");
}
break;
@@ -555,7 +553,7 @@ public class Commands implements PacketType {
String playerToBan = String.join(" ", arguments);
Connection.removeNameFromBanList(playerToBan);
player.getPacketSender().sendMessage(playerToBan + " has been unbanned.");
} catch(Exception e) {
} catch (Exception e) {
player.getPacketSender().sendMessage("Player Must Be Offline.");
}
break;
@@ -697,7 +695,8 @@ public class Commands implements PacketType {
player.playerLevel[skill] = player.getPlayerAssistant().getLevelForXP(player.playerXP[skill]);
player.getPlayerAssistant().refreshSkill(skill);
player.getPlayerAssistant().levelUp(skill);
} catch (Exception e) {}
} catch (Exception e) {
}
break;
case "spellbook":
if (player.inWild()) {
@@ -733,7 +732,8 @@ public class Commands implements PacketType {
} else {
player.getPacketSender().sendMessage("No such item.");
}
} catch (Exception e) {}
} catch (Exception e) {
}
break;
case "master":
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) {
switch (playerCommand.toLowerCase()) {
case "quicksong":
try{
try {
if (arguments.length == 0) {
player.getPacketSender().sendMessage("You must specify a quick song id: ::quicksong id");
return;
}
int song = Integer.parseInt(arguments[0]);
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.");
}
break;
case"cameracutscene":
player.getPlayerAssistant().sendCameraCutscene(player.getX(), player.getY(),10,10, 10); //Test numbers
case "cameracutscene":
player.getPlayerAssistant().sendCameraCutscene(player.getX(), player.getY(), 10, 10, 10); //Test numbers
break;
case"camerashake":
player.getPlayerAssistant().sendCameraShake(1,9,1,9); //these are just test numbers
case "camerashake":
player.getPlayerAssistant().sendCameraShake(1, 9, 1, 9); //these are just test numbers
break;
case "camerareset":
player.getPlayerAssistant().sendCameraReset(); //Resets the camera to the normal player view
@@ -781,10 +781,10 @@ public class Commands implements PacketType {
return;
}
String playerToAdmin = String.join(" ", arguments);
for(int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if(PlayerHandler.players[i] != null) {
if(PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToAdmin)) {
Client c2 = (Client)PlayerHandler.players[i];
for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if (PlayerHandler.players[i] != null) {
if (PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToAdmin)) {
Client c2 = (Client) PlayerHandler.players[i];
player.getPacketSender().sendMessage("You have given " + playerToAdmin + " admin.");
c2.playerRights = 2;
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.");
}
break;
@@ -803,10 +803,10 @@ public class Commands implements PacketType {
return;
}
String playerToAdmin = String.join(" ", arguments);
for(int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if(PlayerHandler.players[i] != null) {
if(PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToAdmin)) {
Client c2 = (Client)PlayerHandler.players[i];
for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if (PlayerHandler.players[i] != null) {
if (PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToAdmin)) {
Client c2 = (Client) PlayerHandler.players[i];
player.getPacketSender().sendMessage("You have demoted " + playerToAdmin + ".");
c2.playerRights = 0;
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.");
}
break;
@@ -825,10 +825,10 @@ public class Commands implements PacketType {
return;
}
String playerToMod = String.join(" ", arguments);
for(int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if(PlayerHandler.players[i] != null) {
if(PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToMod)) {
Client c2 = (Client)PlayerHandler.players[i];
for (int i = 0; i < GameConstants.MAX_PLAYERS; i++) {
if (PlayerHandler.players[i] != null) {
if (PlayerHandler.players[i].playerName.equalsIgnoreCase(playerToMod)) {
Client c2 = (Client) PlayerHandler.players[i];
player.getPacketSender().sendMessage("You have given " + playerToMod + " mod.");
c2.playerRights = 1;
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.");
}
break;
@@ -874,7 +874,8 @@ public class Commands implements PacketType {
} else {
player.getPacketSender().sendMessage("Npc " + newNPC + " does not exist.");
}
} catch (Exception e) {}
} catch (Exception e) {
}
break;
case "cantattack":
player.npcCanAttack = !player.npcCanAttack;
@@ -892,7 +893,8 @@ public class Commands implements PacketType {
player.getPacketSender().sendMessage("You must specify an ID: ::tutprog 10");
return;
}
player.tutorialProgress = Integer.parseInt(arguments[0]);;
player.tutorialProgress = Integer.parseInt(arguments[0]);
;
break;
case "song":
if (arguments.length == 0) {
@@ -908,11 +910,11 @@ public class Commands implements PacketType {
break;
case "runes":
final int amount = 10000;
final int[][] RUNES = { { 554, amount }, { 555, amount },
{ 556, amount }, { 557, amount }, { 558, amount },
{ 559, amount }, { 560, amount }, { 561, amount },
{ 562, amount }, { 563, amount }, { 564, amount },
{ 565, amount }, { 566, amount }, { 1963, 1 }, };
final int[][] RUNES = {{554, amount}, {555, amount},
{556, amount}, {557, amount}, {558, amount},
{559, amount}, {560, amount}, {561, amount},
{562, amount}, {563, amount}, {564, amount},
{565, amount}, {566, amount}, {1963, 1},};
for (int[] element : RUNES) {
int item = element[0];
int amountToRecieve = element[1];