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

Reformat.

Browse Source
This commit is contained in:
drtshock
2014-11-05 18:36:47 -06:00
parent 27bf2008f1
commit 35813c7210
38 changed files with 143 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/massivecraft/factions/cmd/CmdAnnounce.java
View File

@@ -35,7 +35,7 @@ public class CmdAnnounce extends FCommand {
// Add for offline players.
for (FPlayer fp : myFaction.getFPlayersWhereOnline(false)) {
myFaction.addAnnouncement(fp, prefix + message);
myFaction.addAnnouncement(fp, prefix + message);
}
}

5
src/main/java/com/massivecraft/factions/cmd/CmdConvert.java
View File

@@ -1,10 +1,9 @@
package com.massivecraft.factions.cmd;
import org.bukkit.command.ConsoleCommandSender;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Conf.Backend;
import com.massivecraft.factions.zcore.persist.json.FactionsJSON;
import org.bukkit.command.ConsoleCommandSender;
public class CmdConvert extends FCommand {
@@ -31,7 +30,7 @@ public class CmdConvert extends FCommand {
default:
this.sender.sendMessage("Invalid backend");
return;
}
Conf.backEnd = nb;
}

1
src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
View File

@@ -6,7 +6,6 @@ import com.massivecraft.factions.event.FactionCreateEvent;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.MiscUtil;
import org.bukkit.Bukkit;
import java.util.ArrayList;

11
src/main/java/com/massivecraft/factions/cmd/CmdInvite.java
View File

@@ -44,15 +44,12 @@ public class CmdInvite extends FCommand {
}
myFaction.invite(you);
if(!you.isOnline()) return;
if (!you.isOnline()) {
return;
}
// Tooltips, colors, and commands only apply to the string immediately before it.
FancyMessage message = new FancyMessage(fme.describeTo(you, true))
.tooltip("Click to join!").command("f join " + myFaction.getTag())
.then(" has invited you to join ").color(ChatColor.YELLOW)
.tooltip("Click to join!").command("f join " + myFaction.getTag())
.then(myFaction.describeTo(you))
.tooltip("Click to join!").command("f join " + myFaction.getTag());
FancyMessage message = new FancyMessage(fme.describeTo(you, true)).tooltip("Click to join!").command("f join " + myFaction.getTag()).then(" has invited you to join ").color(ChatColor.YELLOW).tooltip("Click to join!").command("f join " + myFaction.getTag()).then(myFaction.describeTo(you)).tooltip("Click to join!").command("f join " + myFaction.getTag());
message.send(you.getPlayer());

3
src/main/java/com/massivecraft/factions/cmd/CmdReload.java
View File

@@ -1,6 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.*;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
public class CmdReload extends FCommand {

2
src/main/java/com/massivecraft/factions/cmd/CmdSB.java
View File

@@ -50,7 +50,7 @@ public class CmdSB extends FCommand {
* @return - true if now set to seeing scoreboards, otherwise false.
*/
public boolean toggle(UUID uuid) {
if(!yml.getBoolean(uuid.toString(), true)) { // check if it's false, if never been toggled, default to false.
if (!yml.getBoolean(uuid.toString(), true)) { // check if it's false, if never been toggled, default to false.
yml.set(uuid.toString(), true);
save();
return true;

20
src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java
View File

@@ -33,20 +33,20 @@ public class CmdSeeChunk extends FCommand {
int blockX;
int blockZ;
blockX = chunkX*16;
blockZ = chunkZ*16;
blockX = chunkX * 16;
blockZ = chunkZ * 16;
showPillar(me, world, blockX, blockZ);
blockX = chunkX*16 + 15;
blockZ = chunkZ*16;
blockX = chunkX * 16 + 15;
blockZ = chunkZ * 16;
showPillar(me, world, blockX, blockZ);
blockX = chunkX*16;
blockZ = chunkZ*16 + 15;
blockX = chunkX * 16;
blockZ = chunkZ * 16 + 15;
showPillar(me, world, blockX, blockZ);
blockX = chunkX*16 + 15;
blockZ = chunkZ*16 + 15;
blockX = chunkX * 16 + 15;
blockZ = chunkZ * 16 + 15;
showPillar(me, world, blockX, blockZ);
}
@@ -54,7 +54,9 @@ public class CmdSeeChunk extends FCommand {
public static void showPillar(Player player, World world, int blockX, int blockZ) {
for (int blockY = 0; blockY < player.getLocation().getBlockY() + 30; blockY++) {
Location loc = new Location(world, blockX, blockY, blockZ);
if (loc.getBlock().getType() != Material.AIR) continue;
if (loc.getBlock().getType() != Material.AIR) {
continue;
}
int typeId = blockY % 5 == 0 ? Material.REDSTONE_LAMP_ON.getId() : Material.STAINED_GLASS.getId();
VisualizeUtil.addLocation(player, loc, typeId);
}

7
src/main/java/com/massivecraft/factions/cmd/CmdTag.java
View File

@@ -1,15 +1,10 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.*;
import com.massivecraft.factions.event.FactionRenameEvent;
import com.massivecraft.factions.scoreboards.FTeamWrapper;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.MiscUtil;
import org.bukkit.Bukkit;
import java.util.ArrayList;