Merge remote branch 'uupstream/master'

This commit is contained in:
CodeForFame 2011-06-24 19:55:10 -05:00
commit c4ea11a48f

View File

@ -111,9 +111,6 @@ public final class Player extends Mob {
public Interpreter interpreter = new Interpreter();
public int click = -1;
public int tempx = -1;
public boolean hasAdminPriv = false;
public boolean hasModPriv = false;
public boolean hasPmodPriv = false;
public long lastCommandUsed = GameEngine.getTime();
/**
* Has the first major update for this player been sent? If not, we can't
@ -3307,11 +3304,4 @@ public final class Player extends Mob {
public String toString() {
return "[Player:" + username + "]";
}
private int smithingbar = -1;
public void setSmithingBar(int id) {
this.smithingbar = id;
}
public int getSmithingBar() {
return smithingbar;
}
}