Format some stuffs
This commit is contained in:
@@ -1,4 +1,6 @@
|
|||||||
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
|
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
|
||||||
<id>bin</id>
|
<id>bin</id>
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
<includeBaseDirectory>false</includeBaseDirectory>
|
||||||
<files>
|
<files>
|
||||||
|
|||||||
@@ -29,16 +29,14 @@ public class Commands implements CommandExecutor {
|
|||||||
sender.sendMessage(Lang.TITLE + "/pv <number>");
|
sender.sendMessage(Lang.TITLE + "/pv <number>");
|
||||||
sender.sendMessage(Lang.TITLE + "/pv <player> <number>");
|
sender.sendMessage(Lang.TITLE + "/pv <player> <number>");
|
||||||
}
|
}
|
||||||
}
|
} else sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
|
||||||
else sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
|
|
||||||
} else if (cmd.getName().equalsIgnoreCase("pvdel")) {
|
} else if (cmd.getName().equalsIgnoreCase("pvdel")) {
|
||||||
switch (args.length) {
|
switch (args.length) {
|
||||||
case 1:
|
case 1:
|
||||||
if (sender instanceof Player) {
|
if (sender instanceof Player) {
|
||||||
Player p = (Player) sender;
|
Player p = (Player) sender;
|
||||||
VaultOperations.deleteOwnVault(p, args[0]);
|
VaultOperations.deleteOwnVault(p, args[0]);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
|
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -75,8 +73,7 @@ public class Commands implements CommandExecutor {
|
|||||||
}
|
}
|
||||||
PlayerVaults.SET_SIGN.put(sender.getName(), new SignSetInfo(i));
|
PlayerVaults.SET_SIGN.put(sender.getName(), new SignSetInfo(i));
|
||||||
sender.sendMessage(Lang.TITLE.toString() + Lang.CLICK_A_SIGN);
|
sender.sendMessage(Lang.TITLE.toString() + Lang.CLICK_A_SIGN);
|
||||||
}
|
} else if (args.length >= 2) {
|
||||||
else if (args.length >= 2) {
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
try {
|
try {
|
||||||
i = Integer.parseInt(args[1]);
|
i = Integer.parseInt(args[1]);
|
||||||
|
|||||||
@@ -85,8 +85,7 @@ public class EconomyOperations {
|
|||||||
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.VAULT_DOES_NOT_EXIST);
|
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.VAULT_DOES_NOT_EXIST);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.VAULT_DOES_NOT_EXIST);
|
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.VAULT_DOES_NOT_EXIST);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -561,7 +561,8 @@ public class Metrics {
|
|||||||
/**
|
/**
|
||||||
* Called when the server owner decides to opt-out of Metrics while the server is running.
|
* Called when the server owner decides to opt-out of Metrics while the server is running.
|
||||||
*/
|
*/
|
||||||
protected void onOptOut() {}
|
protected void onOptOut() {
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -613,7 +614,8 @@ public class Metrics {
|
|||||||
/**
|
/**
|
||||||
* Called after the website graphs have been updated
|
* Called after the website graphs have been updated
|
||||||
*/
|
*/
|
||||||
public void reset() {}
|
public void reset() {
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
|
|||||||
@@ -64,8 +64,7 @@ public class Serialization {
|
|||||||
for (ConfigurationSerializable cs : items) {
|
for (ConfigurationSerializable cs : items) {
|
||||||
if (cs == null) {
|
if (cs == null) {
|
||||||
result.add("null");
|
result.add("null");
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
result.add(new JSONObject(serialize(cs)).toString());
|
result.add(new JSONObject(serialize(cs)).toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -80,8 +79,7 @@ public class Serialization {
|
|||||||
for (String piece : stringItems) {
|
for (String piece : stringItems) {
|
||||||
if (piece.equalsIgnoreCase("null")) {
|
if (piece.equalsIgnoreCase("null")) {
|
||||||
contents.add(null);
|
contents.add(null);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
try {
|
try {
|
||||||
ItemStack item = (ItemStack) deserialize(toMap(new JSONObject(piece)));
|
ItemStack item = (ItemStack) deserialize(toMap(new JSONObject(piece)));
|
||||||
contents.add(item);
|
contents.add(item);
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ public class JSONArray {
|
|||||||
}
|
}
|
||||||
if (x.nextClean() != ']') {
|
if (x.nextClean() != ']') {
|
||||||
x.back();
|
x.back();
|
||||||
for (;;) {
|
for (; ; ) {
|
||||||
if (x.nextClean() == ',') {
|
if (x.nextClean() == ',') {
|
||||||
x.back();
|
x.back();
|
||||||
this.myArrayList.add(JSONObject.NULL);
|
this.myArrayList.add(JSONObject.NULL);
|
||||||
|
|||||||
@@ -196,7 +196,7 @@ public class JSONObject {
|
|||||||
if (x.nextClean() != '{') {
|
if (x.nextClean() != '{') {
|
||||||
throw x.syntaxError("A JSONObject text must begin with '{'");
|
throw x.syntaxError("A JSONObject text must begin with '{'");
|
||||||
}
|
}
|
||||||
for (;;) {
|
for (; ; ) {
|
||||||
c = x.nextClean();
|
c = x.nextClean();
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case 0:
|
case 0:
|
||||||
|
|||||||
@@ -218,7 +218,7 @@ public class JSONTokener {
|
|||||||
* @return A character, or 0 if there are no more characters.
|
* @return A character, or 0 if there are no more characters.
|
||||||
*/
|
*/
|
||||||
public char nextClean() throws JSONException {
|
public char nextClean() throws JSONException {
|
||||||
for (;;) {
|
for (; ; ) {
|
||||||
char c = this.next();
|
char c = this.next();
|
||||||
if (c == 0 || c > ' ') {
|
if (c == 0 || c > ' ') {
|
||||||
return c;
|
return c;
|
||||||
@@ -240,7 +240,7 @@ public class JSONTokener {
|
|||||||
public String nextString(char quote) throws JSONException {
|
public String nextString(char quote) throws JSONException {
|
||||||
char c;
|
char c;
|
||||||
StringBuffer sb = new StringBuffer();
|
StringBuffer sb = new StringBuffer();
|
||||||
for (;;) {
|
for (; ; ) {
|
||||||
c = this.next();
|
c = this.next();
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case 0:
|
case 0:
|
||||||
@@ -295,7 +295,7 @@ public class JSONTokener {
|
|||||||
*/
|
*/
|
||||||
public String nextTo(char delimiter) throws JSONException {
|
public String nextTo(char delimiter) throws JSONException {
|
||||||
StringBuffer sb = new StringBuffer();
|
StringBuffer sb = new StringBuffer();
|
||||||
for (;;) {
|
for (; ; ) {
|
||||||
char c = this.next();
|
char c = this.next();
|
||||||
if (c == delimiter || c == 0 || c == '\n' || c == '\r') {
|
if (c == delimiter || c == 0 || c == '\n' || c == '\r') {
|
||||||
if (c != 0) {
|
if (c != 0) {
|
||||||
@@ -316,7 +316,7 @@ public class JSONTokener {
|
|||||||
public String nextTo(String delimiters) throws JSONException {
|
public String nextTo(String delimiters) throws JSONException {
|
||||||
char c;
|
char c;
|
||||||
StringBuffer sb = new StringBuffer();
|
StringBuffer sb = new StringBuffer();
|
||||||
for (;;) {
|
for (; ; ) {
|
||||||
c = this.next();
|
c = this.next();
|
||||||
if (delimiters.indexOf(c) >= 0 || c == 0 ||
|
if (delimiters.indexOf(c) >= 0 || c == 0 ||
|
||||||
c == '\n' || c == '\r') {
|
c == '\n' || c == '\r') {
|
||||||
|
|||||||
Reference in New Issue
Block a user