Skip to content
This repository was archived by the owner on Jul 7, 2023. It is now read-only.

Commit 5a37320

Browse files
committed
Code Cleanup/Added Configurable option to deny and remove homes in ANY factions land.
More Soon..
1 parent 3559a9f commit 5a37320

File tree

125 files changed

+3659
-3393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+3659
-3393
lines changed

src/main/assembly/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
33
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
44
<id>bin</id>
55
<includeBaseDirectory>false</includeBaseDirectory>

src/main/java/com/massivecraft/factions/Conf.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class Conf {
3535
public static ChatColor colorWar = ChatColor.DARK_RED;
3636
// Power
3737
public static double powerPlayerMax = 10.0;
38-
public static double powerPlayerMin = - 10.0;
38+
public static double powerPlayerMin = -10.0;
3939
public static double powerPlayerStarting = 0.0;
4040
public static double powerPerMinute = 0.2; // Default health rate... it takes 5 min to heal one power
4141
public static double powerPerDeath = 4.0; // A death makes you lose 4 power

src/main/java/com/massivecraft/factions/FLocation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import java.util.Set;
1212

1313
public class FLocation implements Serializable {
14-
private static final long serialVersionUID = - 8292915234027387983L;
14+
private static final long serialVersionUID = -8292915234027387983L;
1515
private static final boolean worldBorderSupport;
1616

1717
static {

src/main/java/com/massivecraft/factions/FPlayer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public interface FPlayer extends EconomyParticipator {
6060
/**
6161
* Sets the faction of the FPlayer
6262
*
63-
* @param faction faction to set.
63+
* @param faction faction to set.
6464
*/
6565
void setFaction(Faction faction);
6666

src/main/java/com/massivecraft/factions/Faction.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public interface Faction extends EconomyParticipator {
5555

5656
String getFocused();
5757

58-
void setFocused(String setFocused);
58+
void setFocused(String setFocused);
5959

6060
String getId();
6161

@@ -65,9 +65,9 @@ public interface Faction extends EconomyParticipator {
6565

6666
void deinvite(FPlayer fplayer);
6767

68-
void setUpgrade(Upgrade upgrade, int level);
68+
void setUpgrade(Upgrade upgrade, int level);
6969

70-
int getUpgrade(Upgrade upgrade);
70+
int getUpgrade(Upgrade upgrade);
7171

7272
boolean isInvited(FPlayer fplayer);
7373

@@ -205,7 +205,7 @@ public interface Faction extends EconomyParticipator {
205205
void resetPerms();
206206

207207
void disband(Player disbander);
208-
208+
209209
void disband(Player disbander, PlayerDisbandReason reason);
210210

211211
// -------------------------------
@@ -273,9 +273,9 @@ public interface Faction extends EconomyParticipator {
273273

274274
FPlayer getFPlayerAdmin();
275275

276-
FPlayer getFPlayerLeader();
276+
FPlayer getFPlayerLeader();
277277

278-
ArrayList<FPlayer> getFPlayersWhereRole(Role role);
278+
ArrayList<FPlayer> getFPlayersWhereRole(Role role);
279279

280280
ArrayList<Player> getOnlinePlayers();
281281

@@ -288,7 +288,7 @@ public interface Faction extends EconomyParticipator {
288288
// used when current leader is about to be removed from the faction;
289289
// promotes new leader, or disbands faction if no other members left
290290
void promoteNewLeader();
291-
291+
292292
void promoteNewLeader(boolean autoLeave);
293293

294294
Role getDefaultRole();

src/main/java/com/massivecraft/factions/MassiveStats.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @author Sam Jakob Harker, Brianna Hazel O'Keefe
3232
* @version 3.0
3333
*/
34-
@SuppressWarnings ("all")
34+
@SuppressWarnings("all")
3535
public class MassiveStats implements Listener {
3636

3737
/* START: MASSIVESTATS SETTINGS */
@@ -258,7 +258,7 @@ class MassiveStatsUpdateTask extends BukkitRunnable {
258258
}
259259

260260
@Override
261-
@SuppressWarnings ("all")
261+
@SuppressWarnings("all")
262262
public void run() {
263263
try {
264264
// Generate the request payload and serialize it as JSON.
@@ -431,7 +431,7 @@ class MassiveStatsDataRequest {
431431
}
432432
}
433433

434-
@SuppressWarnings ("all")
434+
@SuppressWarnings("all")
435435
public String serialize() {
436436
//return object.toString();
437437
try {

0 commit comments

Comments
 (0)