EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed /tpback, it also still saves to file. Should we really remove this? Also need to add saving the pitch/rotation to it too.

Browse Source
This commit is contained in:
nossr50 2010-12-20 02:58:56 -08:00
parent 99a5f13b5e
commit c12f0a0936
2 changed files with 28 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vMinecraftCommands.java
View File

@ -180,9 +180,11 @@ public class vMinecraftCommands{
}
public static int tpback(Player player, String[] args){
if(player.canUseCommand("/tpback")){
double x = vMinecraftUsers.getProfile(player).getTpx();
double y = vMinecraftUsers.getProfile(player).getTpy();
double z = vMinecraftUsers.getProfile(player).getTpz();
String tpxyz = vMinecraftUsers.getProfile(player).getTpxyz();
String tpxyz2[] = tpxyz.split(",");
double x = Double.parseDouble(tpxyz2[0]);
double y = Double.parseDouble(tpxyz2[1]);
double z = Double.parseDouble(tpxyz2[2]);
player.teleportTo(x, y, z, 0, 0);
return EXIT_SUCCESS;
@ -1029,7 +1031,11 @@ public class vMinecraftCommands{
double x = player.getLocation().x;
double y = player.getLocation().y;
double z = player.getLocation().z;
vMinecraftUsers.getProfile(player).setTpback(x, y, z);
String x2 = Double.toString(x);
String y2 = Double.toString(y);
String z2 = Double.toString(z);
String xyz = x2+","+y2+","+z2;
vMinecraftUsers.getProfile(player).setTpback(xyz);
if(player.canUseCommand("/tpback")){
player.sendMessage(Colors.DarkPurple + "Your previous location has been stored, use /tpback to return.");
}
@ -1117,7 +1123,11 @@ public class vMinecraftCommands{
double x = player.getLocation().x;
double y = player.getLocation().y;
double z = player.getLocation().z;
vMinecraftUsers.getProfile(playerTarget).setTpback(x, y, z);
String x2 = Double.toString(x);
String y2 = Double.toString(y);
String z2 = Double.toString(z);
String xyz = x2+","+y2+","+z2;
vMinecraftUsers.getProfile(playerTarget).setTpback(xyz);
if(playerTarget.canUseCommand("/tpback"))
{
playerTarget.sendMessage(Colors.DarkPurple + "Your previous location has been stored, use /tpback to return.");

55
vMinecraftUsers.java
View File

@ -152,10 +152,8 @@ class PlayerList
lastMessage,
nickName,
tag,
suffix;
private double tpx,
tpy,
tpz;
suffix,
tpxyz;
private boolean dead;
@ -184,6 +182,7 @@ class PlayerList
tag = new String();
nickName = new String();
suffix = new String();
tpxyz = new String();
defaultColor = 'f';
ignoreList = new ArrayList<String>();
aliasList = new commandList();
@ -249,15 +248,7 @@ class PlayerList
//Not sure if declaring a double this way will work or not
if(character.length > 7)
{
double tpx = new Double(character[7]).doubleValue();
}
if(character.length > 8)
{
double tpy = new Double(character[8]).doubleValue();
}
if(character.length > 9)
{
double tpz = new Double(character[9]).doubleValue();
tpxyz = character[7];
}
in.close();
return true;
@ -312,9 +303,7 @@ class PlayerList
}
writer.append(":");
writer.append(aliasList.toString());
writer.append(tpx + ":");
writer.append(tpy + ":");
writer.append(tpz + ":");
writer.append(tpxyz.toString());
writer.append("\r\n");
}
}
@ -354,9 +343,7 @@ class PlayerList
out.append(",");
}
out.append(":");
out.append(tpx + ":");
out.append(tpy + ":");
out.append(tpz + ":");
out.append(tpxyz + ":");
out.append(aliasList.toString());
out.newLine();
@ -485,36 +472,20 @@ class PlayerList
//Output: None
//Use: Sets a player's tpback xyz coordinates
//=====================================================================
public void setTpback(double x, double y, double z)
public void setTpback(String newtpback)
{
//Coordinates
x = tpx;
y = tpy;
z = tpz;
tpxyz = newtpback;
}
//=====================================================================
//Function: getTpbx
//Function: getTpxyz
//Input: None
//Output: Double: The player's tpback x coords
//Use: Gets the x value of tpback
//=====================================================================
public double getTpx() { return tpx; }
//=====================================================================
//Function: getTpy
//Input: None
//Output: Double: The player's tpback x coords
//Use: Gets the x value of tpback
//=====================================================================
public double getTpy() { return tpy; }
//=====================================================================
//Function: getTpz
//Input: None
//Output: Double: The player's tpback x coords
//Use: Gets the x value of tpback
//=====================================================================
public double getTpz() { return tpz; }
//=====================================================================
public String getTpxyz()
{
return tpxyz;
}
//Function: getTag
//Input: None
//Output: String: The player tag