Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

create PlayerManager static class

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-01-05 20:47:33 -06:00
parent 76eed79b0a
commit 450ae2ec82
87 changed files with 2730 additions and 2853 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/devcmd/cmds/AuditFailedItemsCmd.java
+2 -1
View File
@@ -11,6 +11,7 @@ package engine.devcmd.cmds;
import engine.Enum.ModType;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.PlayerManager;
import engine.gameManager.PowersManager;
import engine.net.ItemProductionManager;
import engine.objects.*;
@@ -57,7 +58,7 @@ public class AuditFailedItemsCmd extends AbstractDevCmd {
contractName = npc.getContract().getName();
}
PlayerCharacter roller = PlayerCharacter.getFromCache(failedItem.getPlayerID());
PlayerCharacter roller = PlayerManager.getFromCache(failedItem.getPlayerID());
if (roller == null)
playerName = "null";
src/engine/devcmd/cmds/DecachePlayerCmd.java
+3 -2
View File
@@ -12,6 +12,7 @@ package engine.devcmd.cmds;
import engine.Enum;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.objects.AbstractGameObject;
import engine.objects.PlayerCharacter;
@@ -34,8 +35,8 @@ public class DecachePlayerCmd extends AbstractDevCmd {
int objectUUID = Integer.parseInt(words[0]);
if (DbManager.inCache(Enum.GameObjectType.PlayerCharacter, objectUUID)) {
this.setTarget(PlayerCharacter.getFromCache(objectUUID)); //for logging
PlayerCharacter.getFromCache(objectUUID).removeFromCache();
this.setTarget(PlayerManager.getFromCache(objectUUID)); //for logging
PlayerManager.getFromCache(objectUUID).removeFromCache();
} else {
this.sendHelp(pc);
}
src/engine/devcmd/cmds/GotoBoundsCmd.java
+2 -1
View File
@@ -11,6 +11,7 @@ package engine.devcmd.cmds;
import engine.Enum.GameObjectType;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.PlayerManager;
import engine.math.Vector3fImmutable;
import engine.objects.AbstractGameObject;
import engine.objects.Building;
@@ -89,7 +90,7 @@ public class GotoBoundsCmd extends AbstractDevCmd {
return;
}
player.teleport(targetLoc);
PlayerManager.teleport(player, targetLoc);
}
src/engine/devcmd/cmds/GotoCmd.java
+5 -4
View File
@@ -12,6 +12,7 @@ package engine.devcmd.cmds;
import engine.Enum.GameObjectType;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.math.Vector3fImmutable;
import engine.objects.*;
@@ -35,7 +36,7 @@ public class GotoCmd extends AbstractDevCmd {
if (target != null && words[0].isEmpty()) {
AbstractWorldObject targetAgo = (AbstractWorldObject) target;
pc.teleport(targetAgo.getLoc());
PlayerManager.teleport(pc, targetAgo.getLoc());
return;
}
@@ -50,7 +51,7 @@ public class GotoCmd extends AbstractDevCmd {
}
if (loc != null)
pc.teleport(loc);
PlayerManager.teleport(pc, loc);
return;
}
@@ -61,7 +62,7 @@ public class GotoCmd extends AbstractDevCmd {
}
if (loc != null)
pc.teleport(loc);
PlayerManager.teleport(pc, loc);
return;
}
@@ -164,7 +165,7 @@ public class GotoCmd extends AbstractDevCmd {
}
}
if (loc != null) {
pc.teleport(loc);
PlayerManager.teleport(pc, loc);
}
}
src/engine/devcmd/cmds/GotoObj.java
+2 -1
View File
@@ -12,6 +12,7 @@ package engine.devcmd.cmds;
import engine.Enum;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.math.Vector3fImmutable;
import engine.objects.*;
@@ -84,7 +85,7 @@ public class GotoObj extends AbstractDevCmd {
return;
}
player.teleport(targetLoc);
PlayerManager.teleport(player, targetLoc);
}
src/engine/devcmd/cmds/InfoCmd.java
+2 -1
View File
@@ -15,6 +15,7 @@ import engine.Enum.GameObjectType;
import engine.Enum.TargetColor;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.BuildingManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.math.Vector3fImmutable;
import engine.objects.*;
@@ -335,7 +336,7 @@ public class InfoCmd extends AbstractDevCmd {
output += "Altitude : " + targetPC.getLoc().y;
output += "Swimming : " + targetPC.isSwimming();
output += "Swimming : " + PlayerManager.isSwimming(targetPC);
output += newline;
output += "isMoving : " + targetPC.isMoving();
output += newline;
src/engine/devcmd/cmds/JumpCmd.java
+3 -2
View File
@@ -10,6 +10,7 @@
package engine.devcmd.cmds;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.PlayerManager;
import engine.math.Vector3fImmutable;
import engine.objects.AbstractGameObject;
import engine.objects.PlayerCharacter;
@@ -36,7 +37,7 @@ public class JumpCmd extends AbstractDevCmd {
try {
float range = Float.parseFloat(words[1]);
Vector3fImmutable newLoc = pc.getFaceDir().scaleAdd(range, pc.getLoc());
pc.teleport(newLoc);
PlayerManager.teleport(pc, newLoc);
} catch (NumberFormatException e) {
@@ -68,7 +69,7 @@ public class JumpCmd extends AbstractDevCmd {
Vector3fImmutable loc = pc.getLoc();
loc = loc.add(lat, 0f, -lon);
pc.teleport(loc);
PlayerManager.teleport(pc, loc);
}
@Override
src/engine/devcmd/cmds/MakeBaneCmd.java
+3 -6
View File
@@ -12,10 +12,7 @@ package engine.devcmd.cmds;
import engine.Enum.ProtectionState;
import engine.InterestManagement.WorldGrid;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.BuildingManager;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.gameManager.ZoneManager;
import engine.gameManager.*;
import engine.math.Vector3f;
import engine.math.Vector3fImmutable;
import engine.objects.*;
@@ -74,7 +71,7 @@ public class MakeBaneCmd extends AbstractDevCmd {
return;
}
PlayerCharacter player = PlayerCharacter.getPlayerCharacter(attackerID);
PlayerCharacter player = PlayerManager.getPlayerCharacter(attackerID);
if (player.getGuild().isEmptyGuild()) {
@@ -194,7 +191,7 @@ public class MakeBaneCmd extends AbstractDevCmd {
Vector3fImmutable movePlayerOutsideStone = player.getLoc();
movePlayerOutsideStone = movePlayerOutsideStone.setX(movePlayerOutsideStone.x + 10);
movePlayerOutsideStone = movePlayerOutsideStone.setZ(movePlayerOutsideStone.z + 10);
player.teleport(movePlayerOutsideStone);
PlayerManager.teleport(player, movePlayerOutsideStone);
throwbackInfo(pc, "The city has been succesfully baned.");
}
src/engine/devcmd/cmds/ResetLevelCmd.java
+2 -1
View File
@@ -1,6 +1,7 @@
package engine.devcmd.cmds;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.PlayerManager;
import engine.objects.AbstractGameObject;
import engine.objects.PlayerCharacter;
@@ -16,7 +17,7 @@ public class ResetLevelCmd extends AbstractDevCmd {
protected void _doCmd(PlayerCharacter player, String[] args,
AbstractGameObject target) {
player.ResetLevel(Short.parseShort(args[0]));
PlayerManager.ResetLevel(player, Short.parseShort(args[0]));
}
@Override
src/engine/devcmd/cmds/SlotTestCmd.java
+2 -1
View File
@@ -13,6 +13,7 @@ import engine.Enum.GameObjectType;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.BuildingManager;
import engine.gameManager.ChatManager;
import engine.gameManager.PlayerManager;
import engine.math.Vector3fImmutable;
import engine.objects.*;
@@ -56,7 +57,7 @@ public class SlotTestCmd extends AbstractDevCmd {
BuildingLocation buildingLocation = BuildingManager._slotLocations.get(building.meshUUID).get(slot - 1);
slotLocation = building.getLoc().add(buildingLocation.getLocation());
slotLocation = Vector3fImmutable.rotateAroundPoint(building.getLoc(), slotLocation, building.getBounds().getQuaternion().angleY);
playerCharacter.teleport(slotLocation);
PlayerManager.teleport(playerCharacter, slotLocation);
return;
}
src/engine/devcmd/cmds/SummonCmd.java
+2 -1
View File
@@ -10,6 +10,7 @@
package engine.devcmd.cmds;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable;
@@ -91,7 +92,7 @@ public class SummonCmd extends AbstractDevCmd {
this.setTarget(pcToSummon); //for logging
Vector3fImmutable loc = pc.getLoc();
pcToSummon.teleport(loc);
PlayerManager.teleport(pcToSummon, loc);
this.throwbackInfo(pc, "Player " + pcToSummon.getCombinedName()
+ " has been summoned to your location.");
src/engine/devcmd/cmds/aiInfoCmd.java
+2 -1
View File
@@ -11,6 +11,7 @@ package engine.devcmd.cmds;
import engine.Enum.GameObjectType;
import engine.devcmd.AbstractDevCmd;
import engine.gameManager.PlayerManager;
import engine.objects.AbstractGameObject;
import engine.objects.Mob;
import engine.objects.PlayerCharacter;
@@ -77,7 +78,7 @@ public class aiInfoCmd extends AbstractDevCmd {
output += "Players Loaded:" + newline;
}
for (Map.Entry<Integer, Boolean> entry : mob.playerAgroMap.entrySet()) {
output += "Player ID: " + entry.getKey() + " Hate Value: " + (PlayerCharacter.getPlayerCharacter(entry.getKey())).getHateValue() + newline;
output += "Player ID: " + entry.getKey() + " Hate Value: " + (PlayerManager.getPlayerCharacter(entry.getKey())).getHateValue() + newline;
}
if (mob.getCombatTarget() != null)
output += "Current Target: " + mob.getCombatTarget().getName() + newline;