SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed spacing in code around ! operator.

Browse Source
This commit is contained in:
ProSavage
2018-11-07 10:14:42 -06:00
parent 7f1785e152
commit 84f1d354eb
119 changed files with 619 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/massivecraft/factions/util/AutoLeaveProcessTask.java
View File

@@ -29,7 +29,7 @@ public class AutoLeaveProcessTask extends BukkitRunnable {
return;
}
if (! readyToGo) {
if (!readyToGo) {
return;
}
// this is set so it only does one iteration at a time, no matter how frequently the timer fires
@@ -49,7 +49,7 @@ public class AutoLeaveProcessTask extends BukkitRunnable {
FPlayer fplayer = iterator.next();
// Check if they should be exempt from this.
if (! fplayer.willAutoLeave()) {
if (!fplayer.willAutoLeave()) {
SavageFactions.plugin.debug(Level.INFO, fplayer.getName() + " was going to be auto-removed but was set not to.");
continue;
}

2
src/main/java/com/massivecraft/factions/util/AutoLeaveTask.java
View File

@@ -13,7 +13,7 @@ public class AutoLeaveTask implements Runnable {
}
public synchronized void run() {
if (task != null && ! task.isFinished()) {
if (task != null && !task.isFinished()) {
return;
}

4
src/main/java/com/massivecraft/factions/util/EnumTypeAdapter.java
View File

@@ -40,10 +40,10 @@ public final class EnumTypeAdapter<T extends Enum<T>> extends TypeAdapter<T> {
@SuppressWarnings ({"rawtypes", "unchecked"})
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
Class<? super T> rawType = typeToken.getRawType();
if (! Enum.class.isAssignableFrom(rawType) || rawType == Enum.class) {
if (!Enum.class.isAssignableFrom(rawType) || rawType == Enum.class) {
return null;
}
if (! rawType.isEnum()) {
if (!rawType.isEnum()) {
rawType = rawType.getSuperclass(); // handle anonymous subclasses
}
return (TypeAdapter<T>) new EnumTypeAdapter(rawType);

2
src/main/java/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.java
View File

@@ -86,7 +86,7 @@ public class MapFLocToStringSetTypeAdapter implements JsonDeserializer<Map<FLoca
nameArray.add(nameElement);
}
if (! obj.has(locWorld)) {
if (!obj.has(locWorld)) {
obj.add(locWorld, new JsonObject());
}

4
src/main/java/com/massivecraft/factions/util/MiscUtil.java
View File

@@ -23,7 +23,7 @@ public class MiscUtil {
new HashSet<>(Arrays.asList("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"));
public static EntityType creatureTypeFromEntity(Entity entity) {
if (! (entity instanceof Creature)) {
if (!(entity instanceof Creature)) {
return null;
}
@@ -76,7 +76,7 @@ public class MiscUtil {
}
for (char c : str.toCharArray()) {
if (! substanceChars.contains(String.valueOf(c))) {
if (!substanceChars.contains(String.valueOf(c))) {
errors.add(SavageFactions.plugin.txt.parse(TL.GENERIC_FACTIONTAG_ALPHANUMERIC.toString(), c));
}
}

66
src/main/java/com/massivecraft/factions/util/Particles/ParticleEffect.java
View File

@@ -422,7 +422,7 @@ public enum ParticleEffect {
*/
public static ParticleEffect fromName(String name) {
for (Entry<String, ParticleEffect> entry : NAME_MAP.entrySet()) {
if (! entry.getKey().equalsIgnoreCase(name)) {
if (!entry.getKey().equalsIgnoreCase(name)) {
continue;
}
return entry.getValue();
@@ -467,7 +467,7 @@ public enum ParticleEffect {
String world = location.getWorld().getName();
for (Player player : players) {
Location playerLocation = player.getLocation();
if (! world.equals(playerLocation.getWorld().getName()) || playerLocation.distanceSquared(location) < 65536) {
if (!world.equals(playerLocation.getWorld().getName()) || playerLocation.distanceSquared(location) < 65536) {
continue;
}
return true;
@@ -562,13 +562,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, double)
*/
public void display(float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, double range) throws ParticleVersionException, ParticleDataException, IllegalArgumentException {
if (! isSupported()) {
if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version");
}
if (hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect requires additional data");
}
if (hasProperty(ParticleProperty.REQUIRES_WATER) && ! isWater(center)) {
if (hasProperty(ParticleProperty.REQUIRES_WATER) && !isWater(center)) {
throw new IllegalArgumentException("There is no water at the center location");
}
new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, range > 256, null).sendTo(center, range);
@@ -591,13 +591,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, List)
*/
public void display(float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException, IllegalArgumentException {
if (! isSupported()) {
if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version");
}
if (hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect requires additional data");
}
if (hasProperty(ParticleProperty.REQUIRES_WATER) && ! isWater(center)) {
if (hasProperty(ParticleProperty.REQUIRES_WATER) && !isWater(center)) {
throw new IllegalArgumentException("There is no water at the center location");
}
new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, isLongDistance(center, players), null).sendTo(center, players);
@@ -636,16 +636,16 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, double)
*/
public void display(Vector direction, float speed, Location center, double range) throws ParticleVersionException, ParticleDataException, IllegalArgumentException {
if (! isSupported()) {
if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version");
}
if (hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect requires additional data");
}
if (! hasProperty(ParticleProperty.DIRECTIONAL)) {
if (!hasProperty(ParticleProperty.DIRECTIONAL)) {
throw new IllegalArgumentException("This particle effect is not directional");
}
if (hasProperty(ParticleProperty.REQUIRES_WATER) && ! isWater(center)) {
if (hasProperty(ParticleProperty.REQUIRES_WATER) && !isWater(center)) {
throw new IllegalArgumentException("There is no water at the center location");
}
new ParticlePacket(this, direction, speed, range > 256, null).sendTo(center, range);
@@ -665,16 +665,16 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, List)
*/
public void display(Vector direction, float speed, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException, IllegalArgumentException {
if (! isSupported()) {
if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version");
}
if (hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect requires additional data");
}
if (! hasProperty(ParticleProperty.DIRECTIONAL)) {
if (!hasProperty(ParticleProperty.DIRECTIONAL)) {
throw new IllegalArgumentException("This particle effect is not directional");
}
if (hasProperty(ParticleProperty.REQUIRES_WATER) && ! isWater(center)) {
if (hasProperty(ParticleProperty.REQUIRES_WATER) && !isWater(center)) {
throw new IllegalArgumentException("There is no water at the center location");
}
new ParticlePacket(this, direction, speed, isLongDistance(center, players), null).sendTo(center, players);
@@ -708,13 +708,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, double)
*/
public void display(ParticleColor color, Location center, double range) throws ParticleVersionException, ParticleColorException {
if (! isSupported()) {
if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version");
}
if (! hasProperty(ParticleProperty.COLORABLE)) {
if (!hasProperty(ParticleProperty.COLORABLE)) {
throw new ParticleColorException("This particle effect is not colorable");
}
if (! isColorCorrect(this, color)) {
if (!isColorCorrect(this, color)) {
throw new ParticleColorException("The particle color type is incorrect");
}
new ParticlePacket(this, color, range > 256).sendTo(center, range);
@@ -732,13 +732,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, List)
*/
public void display(ParticleColor color, Location center, List<Player> players) throws ParticleVersionException, ParticleColorException {
if (! isSupported()) {
if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version");
}
if (! hasProperty(ParticleProperty.COLORABLE)) {
if (!hasProperty(ParticleProperty.COLORABLE)) {
throw new ParticleColorException("This particle effect is not colorable");
}
if (! isColorCorrect(this, color)) {
if (!isColorCorrect(this, color)) {
throw new ParticleColorException("The particle color type is incorrect");
}
new ParticlePacket(this, color, isLongDistance(center, players)).sendTo(center, players);
@@ -775,13 +775,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, double)
*/
public void display(ParticleData data, float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, double range) throws ParticleVersionException, ParticleDataException {
if (! isSupported()) {
if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version");
}
if (! hasProperty(ParticleProperty.REQUIRES_DATA)) {
if (!hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect does not require additional data");
}
if (! isDataCorrect(this, data)) {
if (!isDataCorrect(this, data)) {
throw new ParticleDataException("The particle data type is incorrect");
}
new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, range > 256, data).sendTo(center, range);
@@ -804,13 +804,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, List)
*/
public void display(ParticleData data, float offsetX, float offsetY, float offsetZ, float speed, int amount, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException {
if (! isSupported()) {
if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version");
}
if (! hasProperty(ParticleProperty.REQUIRES_DATA)) {
if (!hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect does not require additional data");
}
if (! isDataCorrect(this, data)) {
if (!isDataCorrect(this, data)) {
throw new ParticleDataException("The particle data type is incorrect");
}
new ParticlePacket(this, offsetX, offsetY, offsetZ, speed, amount, isLongDistance(center, players), data).sendTo(center, players);
@@ -849,13 +849,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, double)
*/
public void display(ParticleData data, Vector direction, float speed, Location center, double range) throws ParticleVersionException, ParticleDataException {
if (! isSupported()) {
if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version");
}
if (! hasProperty(ParticleProperty.REQUIRES_DATA)) {
if (!hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect does not require additional data");
}
if (! isDataCorrect(this, data)) {
if (!isDataCorrect(this, data)) {
throw new ParticleDataException("The particle data type is incorrect");
}
new ParticlePacket(this, direction, speed, range > 256, data).sendTo(center, range);
@@ -875,13 +875,13 @@ public enum ParticleEffect {
* @see ParticlePacket#sendTo(Location, List)
*/
public void display(ParticleData data, Vector direction, float speed, Location center, List<Player> players) throws ParticleVersionException, ParticleDataException {
if (! isSupported()) {
if (!isSupported()) {
throw new ParticleVersionException("This particle effect is not supported by your server version");
}
if (! hasProperty(ParticleProperty.REQUIRES_DATA)) {
if (!hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect does not require additional data");
}
if (! isDataCorrect(this, data)) {
if (!isDataCorrect(this, data)) {
throw new ParticleDataException("The particle data type is incorrect");
}
new ParticlePacket(this, direction, speed, isLongDistance(center, players), data).sendTo(center, players);
@@ -1033,7 +1033,7 @@ public enum ParticleEffect {
*/
public BlockData(Material material, byte data) throws IllegalArgumentException {
super(material, data);
if (! material.isBlock()) {
if (!material.isBlock()) {
throw new IllegalArgumentException("The material is not a block");
}
}
@@ -1425,7 +1425,7 @@ public enum ParticleEffect {
* @return The version number
*/
public static int getVersion() {
if (! initialized) {
if (!initialized) {
initialize();
}
return version;
@@ -1530,7 +1530,7 @@ public enum ParticleEffect {
String worldName = center.getWorld().getName();
double squared = range * range;
for (Player player : Bukkit.getOnlinePlayers()) {
if (! player.getWorld().getName().equals(worldName) || player.getLocation().distanceSquared(center) > squared) {
if (!player.getWorld().getName().equals(worldName) || player.getLocation().distanceSquared(center) > squared) {
continue;
}
sendTo(center, player);

4
src/main/java/com/massivecraft/factions/util/Particles/ReflectionUtils.java
View File

@@ -44,7 +44,7 @@ public final class ReflectionUtils {
public static Constructor<?> getConstructor(Class<?> clazz, Class<?>... parameterTypes) throws NoSuchMethodException {
Class<?>[] primitiveTypes = DataType.getPrimitive(parameterTypes);
for (Constructor<?> constructor : clazz.getConstructors()) {
if (! DataType.compare(DataType.getPrimitive(constructor.getParameterTypes()), primitiveTypes)) {
if (!DataType.compare(DataType.getPrimitive(constructor.getParameterTypes()), primitiveTypes)) {
continue;
}
return constructor;
@@ -118,7 +118,7 @@ public final class ReflectionUtils {
public static Method getMethod(Class<?> clazz, String methodName, Class<?>... parameterTypes) throws NoSuchMethodException {
Class<?>[] primitiveTypes = DataType.getPrimitive(parameterTypes);
for (Method method : clazz.getMethods()) {
if (! method.getName().equals(methodName) || ! DataType.compare(DataType.getPrimitive(method.getParameterTypes()), primitiveTypes)) {
if (!method.getName().equals(methodName) || !DataType.compare(DataType.getPrimitive(method.getParameterTypes()), primitiveTypes)) {
continue;
}
return method;

4
src/main/java/com/massivecraft/factions/util/RelationUtil.java
View File

@@ -65,7 +65,7 @@ public class RelationUtil {
return Relation.NEUTRAL; // ERROR
}
if (! fthat.isNormal() || ! fme.isNormal()) {
if (!fthat.isNormal() || !fme.isNormal()) {
return Relation.NEUTRAL;
}
@@ -73,7 +73,7 @@ public class RelationUtil {
return Relation.MEMBER;
}
if (! ignorePeaceful && (fme.isPeaceful() || fthat.isPeaceful())) {
if (!ignorePeaceful && (fme.isPeaceful() || fthat.isPeaceful())) {
return Relation.NEUTRAL;
}

16
src/main/java/com/massivecraft/factions/util/SpiralTask.java
View File

@@ -110,7 +110,7 @@ public abstract class SpiralTask implements Runnable {
}
public final void run() {
if (! this.valid() || ! readyToGo) {
if (!this.valid() || !readyToGo) {
return;
}
@@ -118,7 +118,7 @@ public abstract class SpiralTask implements Runnable {
readyToGo = false;
// make sure we're still inside the specified radius
if (! this.insideRadius()) {
if (!this.insideRadius()) {
return;
}
@@ -128,13 +128,13 @@ public abstract class SpiralTask implements Runnable {
// keep going until the task has been running for 20ms or more, then stop to take a breather
while (now() < loopStartTime + 20) {
// run the primary task on the current X/Z coordinates
if (! this.work()) {
if (!this.work()) {
this.finish();
return;
}
// move on to next chunk in spiral
if (! this.moveToNext()) {
if (!this.moveToNext()) {
return;
}
}
@@ -145,7 +145,7 @@ public abstract class SpiralTask implements Runnable {
// step through chunks in spiral pattern from center; returns false if we're done, otherwise returns true
public final boolean moveToNext() {
if (! this.valid()) {
if (!this.valid()) {
return false;
}
@@ -154,7 +154,7 @@ public abstract class SpiralTask implements Runnable {
current++;
// if we're outside the radius, we're done
if (! this.insideRadius()) {
if (!this.insideRadius()) {
return false;
}
} else { // one leg/side of the spiral down...
@@ -179,7 +179,7 @@ public abstract class SpiralTask implements Runnable {
public final boolean insideRadius() {
boolean inside = current < limit;
if (! inside) {
if (!inside) {
this.finish();
}
return inside;
@@ -193,7 +193,7 @@ public abstract class SpiralTask implements Runnable {
// we're done, whether finished or cancelled
public final void stop() {
if (! this.valid()) {
if (!this.valid()) {
return;
}

10
src/main/java/com/massivecraft/factions/util/WarpGUI.java
View File

@@ -95,7 +95,7 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
// All clear lets TP them or ask for password
String warp = warpSlots.get(slot);
if (! fme.getFaction().hasWarpPassword(warp)) {
if (!fme.getFaction().hasWarpPassword(warp)) {
if (transact(fme)) {
doWarmup(warp);
}
@@ -129,13 +129,13 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
}
private boolean transact(FPlayer player) {
if (! SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing()) {
if (!SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing()) {
return true;
}
double cost = SavageFactions.plugin.getConfig().getDouble("warp-cost.warp", 5);
if (! Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.isAdminBypassing()) {
if (!Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.isAdminBypassing()) {
return true;
}
@@ -183,7 +183,7 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
string = ChatColor.translateAlternateColorCodes('&', string);
string = string.replace("{warp}", warp);
string = string.replace("{warp-protected}", faction.hasWarpPassword(warp) ? "Enabled" : "Disabled");
string = string.replace("{warp-cost}", ! SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) ? "Disabled" : Integer.toString(SavageFactions.plugin.getConfig().getInt("warp-cost.warp", 5)));
string = string.replace("{warp-cost}", !SavageFactions.plugin.getConfig().getBoolean("warp-cost.enabled", false) ? "Disabled" : Integer.toString(SavageFactions.plugin.getConfig().getInt("warp-cost.warp", 5)));
return string;
}
@@ -243,7 +243,7 @@ public class WarpGUI implements InventoryHolder, FactionGUI {
ItemMeta itemMeta = itemStack.getItemMeta();
if (! SavageFactions.plugin.mc17) {
if (!SavageFactions.plugin.mc17) {
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES);
}