lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Location fields should not be public.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-07-30 19:07:20 +00:00
parent 95bd2bcac1
commit 232046cf4a
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java
View File

@@ -752,7 +752,7 @@ public class AdminCTFEngine implements IAdminCommandHandler
final Location npc_loc = CTF.get_npcLocation(); final Location npc_loc = CTF.get_npcLocation();
replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + CTF.get_npcId() + " on pos " + npc_loc._x + "," + npc_loc._y + "," + npc_loc._z + "</font><br1>"); replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + CTF.get_npcId() + " on pos " + npc_loc.getX() + "," + npc_loc.getY() + "," + npc_loc.getZ() + "</font><br1>");
replyMSG.append("<button value=\"Tele->NPC\" action=\"bypass -h admin_ctf_tele_npc\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><br>"); replyMSG.append("<button value=\"Tele->NPC\" action=\"bypass -h admin_ctf_tele_npc\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><br>");
replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + CTF.get_rewardId() + "</font><br1>"); replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + CTF.get_rewardId() + "</font><br1>");
if (ItemTable.getInstance().getTemplate(CTF.get_rewardId()) != null) if (ItemTable.getInstance().getTemplate(CTF.get_rewardId()) != null)

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDMEngine.java
View File

@@ -299,7 +299,7 @@ public class AdminDMEngine implements IAdminCommandHandler
final Location npc_loc = DM.get_npcLocation(); final Location npc_loc = DM.get_npcLocation();
replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + DM.get_npcId() + " on pos " + npc_loc._x + "," + npc_loc._y + "," + npc_loc._z + "</font><br1>"); replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + DM.get_npcId() + " on pos " + npc_loc.getX() + "," + npc_loc.getY() + "," + npc_loc.getZ() + "</font><br1>");
replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + DM.get_rewardId() + "</font><br1>"); replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + DM.get_rewardId() + "</font><br1>");
replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + DM.get_rewardAmount() + "</font><br><br>"); replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + DM.get_rewardAmount() + "</font><br><br>");
replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + DM.get_minlvl() + "</font><br>"); replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + DM.get_minlvl() + "</font><br>");
@@ -308,7 +308,7 @@ public class AdminDMEngine implements IAdminCommandHandler
final Location player_loc = DM.get_playersSpawnLocation(); final Location player_loc = DM.get_playersSpawnLocation();
replyMSG.append("Death Match Spawn Pos:&nbsp;<font color=\"00FF00\">" + player_loc._x + "," + player_loc._y + "," + player_loc._z + "</font><br><br>"); replyMSG.append("Death Match Spawn Pos:&nbsp;<font color=\"00FF00\">" + player_loc.getX() + "," + player_loc.getY() + "," + player_loc.getZ() + "</font><br><br>");
replyMSG.append("Current players:<br1>"); replyMSG.append("Current players:<br1>");
if (!DM.is_started()) if (!DM.is_started())

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTvTEngine.java
View File

@@ -428,7 +428,7 @@ public class AdminTvTEngine implements IAdminCommandHandler
final Location npc_loc = TvT.get_npcLocation(); final Location npc_loc = TvT.get_npcLocation();
replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + TvT.get_npcId() + " on pos " + npc_loc._x + "," + npc_loc._y + "," + npc_loc._z + "</font><br1>"); replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + TvT.get_npcId() + " on pos " + npc_loc.getX() + "," + npc_loc.getY() + "," + npc_loc.getZ() + "</font><br1>");
replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + TvT.get_rewardId() + "</font><br1>"); replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + TvT.get_rewardId() + "</font><br1>");
replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + TvT.get_rewardAmount() + "</font><br><br>"); replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + TvT.get_rewardAmount() + "</font><br><br>");
replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + TvT.get_minlvl() + "</font><br>"); replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + TvT.get_minlvl() + "</font><br>");

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Location.java
View File

@@ -20,10 +20,10 @@ import org.l2jmobius.gameserver.model.actor.Creature;
public class Location public class Location
{ {
public int _x; protected int _x;
public int _y; protected int _y;
public int _z; protected int _z;
public int _heading = 0; private int _heading = 0;
public Location(int x, int y, int z) public Location(int x, int y, int z)
{ {

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -6677,7 +6677,7 @@ public final class PlayerInstance extends Playable
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
final Location p_loc = DM.get_playersSpawnLocation(); final Location p_loc = DM.get_playersSpawnLocation();
teleToLocation(p_loc._x, p_loc._y, p_loc._z, false); teleToLocation(p_loc.getX(), p_loc.getY(), p_loc.getZ(), false);
doRevive(); doRevive();
}, Config.DM_REVIVE_DELAY); }, Config.DM_REVIVE_DELAY);
} }
@@ -6690,7 +6690,7 @@ public final class PlayerInstance extends Playable
ThreadPool.schedule(() -> ThreadPool.schedule(() ->
{ {
final Location players_loc = DM.get_playersSpawnLocation(); final Location players_loc = DM.get_playersSpawnLocation();
teleToLocation(players_loc._x, players_loc._y, players_loc._z, false); teleToLocation(players_loc.getX(), players_loc.getY(), players_loc.getZ(), false);
doRevive(); doRevive();
}, 20000); }, 20000);
} }