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

1.1-RELEASECANDIDATE-1

Browse Source 
Made the particles in /f fly more cloud like
Changed wilderness color to Darkgreen
Added a factionless check to inspect, so itll now disable the when you try to check with no faction.
Inspect will disable upon entering combat
You cannot claim outside the worldborder anymore, the chunkbuffer is taken into account.
Particles WILL NOT appear in /vanish and in spectator mode
This commit is contained in:
Naman
2018-04-13 21:05:43 -05:00
parent efee66071b
commit e36927db9f
15 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,15 +47,21 @@ public class CmdFly extends FCommand {
if (!player.isFlying()) {
continue;
}
if (player.getGameMode() == GameMode.SPECTATOR){
continue;
}
if (FPlayers.getInstance().getByPlayer(player).isVanished()){
continue;
}
ParticleEffect.CLOUD.display(0, 0, 0, 0, 1, player.getLocation().add(0, -0.35, 0), 16);
ParticleEffect.CLOUD.display((float) 0, (float) 0, (float) 0, (float) 0, 3, player.getLocation().add(0, -0.35, 0), 16);
}
if (flyMap.keySet().size() == 0) {
Bukkit.getScheduler().cancelTask(id);
id = -1;
}
}
}, 10L, 10L);
}, 10L, 3L);
}
public static void startFlyCheck() {
@@ -76,7 +82,6 @@ public class CmdFly extends FCommand {
continue;
}
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
if (fPlayer == null) {
continue;
}

4
src/main/java/com/massivecraft/factions/cmd/CmdRules.java
View File

@@ -52,8 +52,8 @@ public class CmdRules extends FCommand {
if (args.get(0).equalsIgnoreCase("set")) {
fme.msg(TL.COMMAND_RULES_SET_INVALIDARGS);
}
if (args.get(0).equalsIgnoreCase("add")) {
fme.msg(TL.COMMAND_RULES_ADD_INVALIDARGS);
if (args.get(0).equalsIgnoreCase("remove")) {
fme.msg(TL.COMMAND_RULES_REMOVE_INVALIDARGS);
}
if (args.get(0).equalsIgnoreCase("clear")) {
fme.getFaction().clearRules();

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

@@ -202,7 +202,7 @@ public class FCmdRoot extends FCommand {
this.addSubCommand(this.cmdTpBanner);
this.addSubCommand(this.cmdKillHolograms);
if (CoreProtect.getInstance() != null){
if (Bukkit.getServer().getPluginManager().getPlugin("CoreProtect") != null){
P.p.log("Found CoreProtect, enabling Inspect");
this.addSubCommand(this.cmdInspect);
} else {