forked from MagicBane/Server
create PlayerManager static class
This commit is contained in:
@@ -261,7 +261,7 @@ public final class Bane {
|
||||
Vector3fImmutable movePlayerOutsideStone = player.getLoc();
|
||||
movePlayerOutsideStone = movePlayerOutsideStone.setX(movePlayerOutsideStone.x + 10);
|
||||
movePlayerOutsideStone = movePlayerOutsideStone.setZ(movePlayerOutsideStone.z + 10);
|
||||
player.teleport(movePlayerOutsideStone);
|
||||
PlayerManager.teleport(player, movePlayerOutsideStone);
|
||||
|
||||
// Notify players
|
||||
|
||||
@@ -734,7 +734,7 @@ public final class Bane {
|
||||
HashSet<AbstractWorldObject> inSiegeRange = WorldGrid.getObjectsInRangePartial(city.getTOL().loc,1750f,1);
|
||||
for(AbstractWorldObject obj : inSiegeRange){
|
||||
int uuid = obj.getObjectUUID();
|
||||
PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
|
||||
PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
|
||||
if(player == null)
|
||||
continue;
|
||||
Guild playerNation = player.guild.getNation();
|
||||
@@ -749,7 +749,7 @@ public final class Bane {
|
||||
int attackerSize = 0;
|
||||
int defenderSize = 0;
|
||||
for(int uuid : city.baneAttendees.keySet()){
|
||||
PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
|
||||
PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
|
||||
if(player == null)
|
||||
continue;
|
||||
if(player.guild.getNation().equals(defendNation))
|
||||
@@ -762,7 +762,7 @@ public final class Bane {
|
||||
float attackerMultiplier = ZergManager.getCurrentMultiplier(attackerSize,this.capSize);
|
||||
float defenderMultiplier = ZergManager.getCurrentMultiplier(defenderSize,this.capSize);
|
||||
for(int uuid : attackers){
|
||||
PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
|
||||
PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
|
||||
if(inSiegeRange.contains(player)) //player is still physically here, needs updated multiplier
|
||||
player.ZergMultiplier = attackerMultiplier;
|
||||
else
|
||||
@@ -770,7 +770,7 @@ public final class Bane {
|
||||
}
|
||||
|
||||
for(int uuid : defenders){
|
||||
PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
|
||||
PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
|
||||
if(inSiegeRange.contains(player)) //player is still physically here, needs updated multiplier
|
||||
player.ZergMultiplier = defenderMultiplier;
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user