Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:09:45 +02:00
parent 46bd0570d7
commit 7dc3a2159a
379 changed files with 3418 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/client/command/commands/gm6/ClearQuestCacheCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.quest.MapleQuest;
@@ -35,7 +35,7 @@ public class ClearQuestCacheCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
MapleQuest.clearCache();
player.dropMessage(5, "Quest Cache Cleared.");
}

4
src/main/java/client/command/commands/gm6/ClearQuestCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.quest.MapleQuest;
@@ -35,7 +35,7 @@ public class ClearQuestCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.dropMessage(5, "Please include a quest ID.");
return;

6
src/main/java/client/command/commands/gm6/DCAllCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -36,9 +36,9 @@ public class DCAllCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
for (World world : Server.getInstance().getWorlds()) {
for (MapleCharacter chr : world.getPlayerStorage().getAllCharacters()) {
for (Character chr : world.getPlayerStorage().getAllCharacters()) {
if (!chr.isGM()) {
chr.getClient().disconnect(false, false);
}

6
src/main/java/client/command/commands/gm6/GetAccCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,12 +34,12 @@ public class GetAccCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !getacc <playername>");
return;
}
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
if (victim != null) {
player.message(victim.getName() + "'s account name is " + victim.getClient().getAccountName() + ".");
} else {

6
src/main/java/client/command/commands/gm6/MapPlayersCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -36,11 +36,11 @@ public class MapPlayersCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
String names = "";
int map = player.getMapId();
for (World world : Server.getInstance().getWorlds()) {
for (MapleCharacter chr : world.getPlayerStorage().getAllCharacters()) {
for (Character chr : world.getPlayerStorage().getAllCharacters()) {
int curMap = chr.getMapId();
String hp = Integer.toString(chr.getHp());
String maxhp = Integer.toString(chr.getCurrentMaxHp());

6
src/main/java/client/command/commands/gm6/SaveAllCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -37,9 +37,9 @@ public class SaveAllCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
for (World world : Server.getInstance().getWorlds()) {
for (MapleCharacter chr : world.getPlayerStorage().getAllCharacters()) {
for (Character chr : world.getPlayerStorage().getAllCharacters()) {
chr.saveCharToDB();
}
}

4
src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -36,7 +36,7 @@ public class ServerAddChannelCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
final MapleCharacter player = c.getPlayer();
final Character player = c.getPlayer();
if (params.length < 1) {
player.dropMessage(5, "Syntax: @addchannel <worldid>");

4
src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -36,7 +36,7 @@ public class ServerAddWorldCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
final MapleCharacter player = c.getPlayer();
final Character player = c.getPlayer();
ThreadManager.getInstance().newTask(() -> {
int wid = Server.getInstance().addWorld();

4
src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -36,7 +36,7 @@ public class ServerRemoveChannelCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
final MapleCharacter player = c.getPlayer();
final Character player = c.getPlayer();
if (params.length < 1) {
player.dropMessage(5, "Syntax: @removechannel <worldid>");

4
src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -36,7 +36,7 @@ public class ServerRemoveWorldCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
final MapleCharacter player = c.getPlayer();
final Character player = c.getPlayer();
final int rwid = Server.getInstance().getWorldsSize() - 1;
if(rwid <= 0) {

6
src/main/java/client/command/commands/gm6/SetGmLevelCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,14 +34,14 @@ public class SetGmLevelCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 2) {
player.yellowMessage("Syntax: !setgmlevel <playername> <newlevel>");
return;
}
int newLevel = Integer.parseInt(params[1]);
MapleCharacter target = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
if (target != null) {
target.setGMLevel(newLevel);
target.getClient().setGMLevel(newLevel);

6
src/main/java/client/command/commands/gm6/ShutdownCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -37,7 +37,7 @@ public class ShutdownCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1){
player.yellowMessage("Syntax: !shutdown [<time>|NOW]");
return;
@@ -63,7 +63,7 @@ public class ShutdownCommand extends Command {
strTime += seconds + " seconds";
for (World w : Server.getInstance().getWorlds()) {
for (MapleCharacter chr : w.getPlayerStorage().getAllCharacters()) {
for (Character chr : w.getPlayerStorage().getAllCharacters()) {
chr.dropMessage("Server is undergoing maintenance process, and will be shutdown in " + strTime + ". Prepare yourself to quit safely in the mean time.");
}
}

4
src/main/java/client/command/commands/gm6/SpawnAllPNpcsCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.life.MaplePlayerNPC;
@@ -35,7 +35,7 @@ public class SpawnAllPNpcsCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
MaplePlayerNPC.multicastSpawnPlayerNPC(player.getMapId(), player.getWorld());
}
}

4
src/main/java/client/command/commands/gm6/SupplyRateCouponCommand.java
View File

@@ -19,7 +19,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -31,7 +31,7 @@ public class SupplyRateCouponCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.dropMessage(5, "Syntax: !supplyratecoupon <yes|no>");
return;

4
src/main/java/client/command/commands/gm6/WarpWorldCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm6;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -39,7 +39,7 @@ public class WarpWorldCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.yellowMessage("Syntax: !warpworld <worldid>");
return;