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

Format. Haven't done this in awhile. Just sneak it in.

Browse Source
This commit is contained in:
Trent Hensler
2018-01-04 17:40:27 -08:00
parent f019c4f833
commit 5c2abb34de
24 changed files with 113 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/massivecraft/factions/integration/Worldguard.java
View File

@@ -89,19 +89,19 @@ public class Worldguard {
// Returns:
// True: Regions found within chunk
// False: No regions found within chunk
public static boolean checkForRegionsInChunk(FLocation floc) {
Chunk chunk = floc.getWorld().getChunkAt((int) floc.getX(), (int) floc.getZ());
return checkForRegionsInChunk(chunk);
}
public static boolean checkForRegionsInChunk(Location loc) {
Chunk chunk = loc.getWorld().getChunkAt(loc);
Chunk chunk = floc.getWorld().getChunkAt((int) floc.getX(), (int) floc.getZ());
return checkForRegionsInChunk(chunk);
}
public static boolean checkForRegionsInChunk(Location loc) {
Chunk chunk = loc.getWorld().getChunkAt(loc);
return checkForRegionsInChunk(chunk);
}
public static boolean checkForRegionsInChunk(Chunk chunk) {
if (!enabled) {
// No WG hooks so we'll always bypass this check.

6
src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java
View File

@@ -574,9 +574,9 @@ public class EngineDynmap {
PlayerSet set = this.markerApi.getPlayerSet(setId);
if (set == null) {
set = this.markerApi.createPlayerSet(setId, // id
true, // symmetric
playerIds, // players
false // persistent
true, // symmetric
playerIds, // players
false // persistent
);
}
if (set == null) {

4
src/main/java/com/massivecraft/factions/integration/dynmap/TempAreaMarker.java
View File

@@ -72,8 +72,8 @@ public class TempAreaMarker {
// Line Style
if (marker.getLineWeight() != this.lineWeight ||
marker.getLineOpacity() != this.lineOpacity ||
marker.getLineColor() != this.lineColor) {
marker.getLineOpacity() != this.lineOpacity ||
marker.getLineColor() != this.lineColor) {
marker.setLineStyle(this.lineWeight, this.lineOpacity, this.lineColor);
}