kaboomserver/extras
1
0
Fork 0
mirror of https://github.com/kaboomserver/extras.git synced 2025-02-11 11:40:19 +00:00
Code Issues Projects Releases Wiki Activity

Use consistent equals style

Browse source
This commit is contained in:
mathiascode 2020-02-14 23:44:00 +02:00
parent ce538c940d
commit 177d2ce452
11 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/pw/kaboom/extras/commands/CommandClearChat.java
View file

@ -19,9 +19,6 @@ public final class CommandClearChat implements CommandExecutor {
} }
onlinePlayer.sendMessage(ChatColor.DARK_GREEN + "The chat has been cleared"); onlinePlayer.sendMessage(ChatColor.DARK_GREEN + "The chat has been cleared");
} }
//for (final Chunk chunk : ((Player)sender).getWorld().getLoadedChunks()) {
// ((Player)sender).getWorld().regenerateChunk(chunk.getX(), chunk.getZ());
// }
return true; return true;
} }
} }

2
src/main/java/pw/kaboom/extras/commands/CommandDestroyEntities.java
View file

@ -17,7 +17,7 @@ public final class CommandDestroyEntities implements CommandExecutor {
for (World world : Bukkit.getWorlds()) { for (World world : Bukkit.getWorlds()) {
for (Entity entity : world.getEntities()) { for (Entity entity : world.getEntities()) {
if (entity.getType() != EntityType.PLAYER) { if (!EntityType.PLAYER.equals(entity.getType())) {
entity.remove(); entity.remove();
entityCount++; entityCount++;
} }

2
src/main/java/pw/kaboom/extras/commands/CommandEnchantAll.java
View file

@ -21,7 +21,7 @@ public final class CommandEnchantAll implements CommandExecutor {
final Player player = (Player) sender; final Player player = (Player) sender;
final ItemStack item = player.getInventory().getItemInMainHand(); final ItemStack item = player.getInventory().getItemInMainHand();
if (item.getType() == Material.AIR) { if (Material.AIR.equals(item.getType())) {
player.sendMessage("Please hold an item in your hand to enchant it"); player.sendMessage("Please hold an item in your hand to enchant it");
} else { } else {
for (Enchantment enchantment : Enchantment.values()) { for (Enchantment enchantment : Enchantment.values()) {

2
src/main/java/pw/kaboom/extras/commands/CommandPrefix.java
View file

@ -30,7 +30,7 @@ public final class CommandPrefix implements CommandExecutor {
try { try {
if (args.length == 0) { if (args.length == 0) {
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <prefix|off>"); player.sendMessage(ChatColor.RED + "Usage: /" + label + " <prefix|off>");
} else if (args[0].equalsIgnoreCase("off")) { } else if ("off".equalsIgnoreCase(args[0])) {
prefixConfig.set(player.getUniqueId().toString(), null); prefixConfig.set(player.getUniqueId().toString(), null);
prefixConfig.save(configFile); prefixConfig.save(configFile);
player.sendMessage("You no longer have a tag"); player.sendMessage("You no longer have a tag");

4
src/main/java/pw/kaboom/extras/commands/CommandSpidey.java
View file

@ -34,8 +34,8 @@ public final class CommandSpidey implements CommandExecutor {
); );
while (blockIterator.hasNext() while (blockIterator.hasNext()
&& (blockIterator.next().getType() == Material.AIR && (Material.AIR.equals(blockIterator.next().getType())
|| blockIterator.next().getType() == Material.CAVE_AIR)) { || Material.CAVE_AIR.equals(blockIterator.next().getType()))) {
blockIterator.next().setType(Material.COBWEB); blockIterator.next().setType(Material.COBWEB);
} }
} }

2
src/main/java/pw/kaboom/extras/commands/CommandUsername.java
View file

@ -25,7 +25,7 @@ public final class CommandUsername implements CommandExecutor {
final String name = nameColor.substring(0, Math.min(16, nameColor.length())); final String name = nameColor.substring(0, Math.min(16, nameColor.length()));
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) { for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
if (onlinePlayer.getName().equals(name)) { if (name.equals(onlinePlayer.getName())) {
player.sendMessage("A player with that username is already logged in"); player.sendMessage("A player with that username is already logged in");
return true; return true;
} }

15
src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java
View file

@ -53,10 +53,10 @@ public class EntitySpawn implements Listener {
final int worldDragonCount = world.getEntitiesByClass(EnderDragon.class).size(); final int worldDragonCount = world.getEntitiesByClass(EnderDragon.class).size();
final int worldDragonCountLimit = 24; final int worldDragonCountLimit = 24;
if ((!entityType.equals(EntityType.PLAYER) && if ((!EntityType.PLAYER.equals(entityType) &&
isEntityLimitReached(chunkEntityCount, chunkEntityCountLimit, isAddToWorldEvent)) || isEntityLimitReached(chunkEntityCount, chunkEntityCountLimit, isAddToWorldEvent)) ||
(entityType.equals(EntityType.ENDER_DRAGON) && (EntityType.ENDER_DRAGON.equals(entityType) &&
isEntityLimitReached(worldDragonCount, worldDragonCountLimit, isAddToWorldEvent))) { isEntityLimitReached(worldDragonCount, worldDragonCountLimit, isAddToWorldEvent))) {
return true; return true;
} }
@ -68,7 +68,7 @@ public class EntitySpawn implements Listener {
if (worldEntityCount > 1024) { if (worldEntityCount > 1024) {
for (Entity entity : world.getEntities()) { for (Entity entity : world.getEntities()) {
if (!entity.getType().equals(EntityType.PLAYER)) { if (!EntityType.PLAYER.equals(entity.getType())) {
entity.remove(); entity.remove();
} }
} }
@ -163,7 +163,7 @@ public class EntitySpawn implements Listener {
} }
private void limitSpawner(CreatureSpawner spawner) { private void limitSpawner(CreatureSpawner spawner) {
if (spawner.getSpawnedType().equals(EntityType.MINECART_MOB_SPAWNER)) { if (EntityType.MINECART_MOB_SPAWNER.equals(spawner.getSpawnedType())) {
spawner.setSpawnedType(EntityType.MINECART); spawner.setSpawnedType(EntityType.MINECART);
} }
@ -209,7 +209,7 @@ public class EntitySpawn implements Listener {
final boolean isAddToWorldEvent = true; final boolean isAddToWorldEvent = true;
if (checkEntityLimits(entityType, chunk, world, isAddToWorldEvent) if (checkEntityLimits(entityType, chunk, world, isAddToWorldEvent)
&& !entity.getType().equals(EntityType.PLAYER)) { && !EntityType.PLAYER.equals(entity.getType())) {
entity.remove(); entity.remove();
return; return;
} }
@ -224,7 +224,6 @@ public class EntitySpawn implements Listener {
@EventHandler @EventHandler
void onEntitySpawn(EntitySpawnEvent event) { void onEntitySpawn(EntitySpawnEvent event) {
System.out.println(event.getEntityType());
final double X = event.getLocation().getX(); final double X = event.getLocation().getX();
final double Y = event.getLocation().getY(); final double Y = event.getLocation().getY();
final double Z = event.getLocation().getZ(); final double Z = event.getLocation().getZ();
@ -293,7 +292,7 @@ public class EntitySpawn implements Listener {
@EventHandler @EventHandler
void onSpawnerSpawn(SpawnerSpawnEvent event) { void onSpawnerSpawn(SpawnerSpawnEvent event) {
if (event.getEntityType().equals(EntityType.FALLING_BLOCK)) { if (EntityType.FALLING_BLOCK.equals(event.getEntityType())) {
if (((FallingBlock) event.getEntity()).getBlockData().getMaterial().equals(Material.SPAWNER)) { if (((FallingBlock) event.getEntity()).getBlockData().getMaterial().equals(Material.SPAWNER)) {
event.setCancelled(true); event.setCancelled(true);
event.getSpawner().setSpawnedType(EntityType.FALLING_BLOCK); event.getSpawner().setSpawnedType(EntityType.FALLING_BLOCK);
@ -304,7 +303,7 @@ public class EntitySpawn implements Listener {
@EventHandler @EventHandler
void onTNTPrime(TNTPrimeEvent event) { void onTNTPrime(TNTPrimeEvent event) {
if (event.getBlock().getWorld().getEntitiesByClass(TNTPrimed.class).size() > 120) { if (event.getBlock().getWorld().getEntitiesByClass(TNTPrimed.class).size() > 120) {
if (event.getReason().equals(PrimeReason.EXPLOSION)) { if (PrimeReason.EXPLOSION.equals(event.getReason())) {
event.setCancelled(true); event.setCancelled(true);
} }
} }

2
src/main/java/pw/kaboom/extras/modules/player/PlayerCommand.java
View file

@ -37,7 +37,7 @@ public final class PlayerCommand implements Listener {
final String checkedCommand = ServerCommand.checkCommand(sender, command, isConsoleCommand); final String checkedCommand = ServerCommand.checkCommand(sender, command, isConsoleCommand);
if (checkedCommand != null) { if (checkedCommand != null) {
if (checkedCommand.equals("cancel")) { if ("cancel".equals(checkedCommand)) {
event.setCancelled(true); event.setCancelled(true);
} else { } else {
event.setMessage(checkedCommand); event.setMessage(checkedCommand);

4
src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java
View file

@ -48,7 +48,7 @@ public final class PlayerConnection implements Listener {
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "Your username can't be longer than 16 characters"); event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "Your username can't be longer than 16 characters");
} else { } else {
for (Player player : Bukkit.getOnlinePlayers()) { for (Player player : Bukkit.getOnlinePlayers()) {
if (player.getName().equals(event.getName())) { if (event.getName().equals(player.getName())) {
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "A player with that username is already logged in"); event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, "A player with that username is already logged in");
} }
} }
@ -146,7 +146,7 @@ public final class PlayerConnection implements Listener {
event.allow(); event.allow();
} }
if (event.getResult() == Result.KICK_FULL if (Result.KICK_FULL.equals(event.getResult())
&& JavaPlugin.getPlugin(Main.class).getConfig().getBoolean("allowJoinOnFullServer")) { && JavaPlugin.getPlugin(Main.class).getConfig().getBoolean("allowJoinOnFullServer")) {
event.allow(); event.allow();
} }

4
src/main/java/pw/kaboom/extras/modules/player/PlayerDamage.java
View file

@ -29,8 +29,8 @@ import org.bukkit.inventory.ItemStack;
public final class PlayerDamage implements Listener { public final class PlayerDamage implements Listener {
@EventHandler @EventHandler
void onEntityDamage(final EntityDamageEvent event) { void onEntityDamage(final EntityDamageEvent event) {
if (event.getEntityType() == EntityType.PLAYER) { if (EntityType.PLAYER.equals(event.getEntityType())) {
if (event.getCause() == DamageCause.VOID if (DamageCause.VOID.equals(event.getCause())
&& event.getDamage() == Float.MAX_VALUE) { && event.getDamage() == Float.MAX_VALUE) {
event.setCancelled(true); event.setCancelled(true);
} }

2
src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java
View file

@ -173,7 +173,7 @@ public final class ServerCommand implements Listener {
final String checkedCommand = checkCommand(sender, command, isConsoleCommand); final String checkedCommand = checkCommand(sender, command, isConsoleCommand);
if (checkedCommand != null) { if (checkedCommand != null) {
if (checkedCommand.equals("cancel")) { if ("cancel".equals(checkedCommand)) {
event.setCancelled(true); event.setCancelled(true);
} else { } else {
event.setCommand(checkedCommand); event.setCommand(checkedCommand);