Merge pull request #113 from ProSavage/ident-fixes

Indent Fixes - Liz
This commit is contained in:
Naman 2019-03-02 21:58:55 -06:00 committed by GitHub
commit 0abada3708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
233 changed files with 26902 additions and 26895 deletions

View File

@ -12,6 +12,8 @@
* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
* Please use tabs as ident with a size of 3 spaces.
#### **Did you fix whitespace, format code, or make a purely cosmetic patch?**
Please specify what changes you made to the formatting etc., as it allows us to get an idea of how this will change our files overall.

View File

@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableMap;
import com.massivecraft.factions.integration.dynmap.DynmapStyle;
import com.massivecraft.factions.util.MultiversionMaterials;
import com.massivecraft.factions.zcore.fperms.DefaultPermissions;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;

View File

@ -203,6 +203,7 @@ public interface Faction extends EconomyParticipator {
void setPermission(Permissable permissable, PermissableAction permissableAction, Access access);
void resetPerms();
void setDefaultPerms();
void disband(Player disbander);

View File

@ -654,7 +654,7 @@ public class FactionsPlayerListener implements Listener {
//For Blocking Homes and Blocking Teleportation To Homes
@EventHandler
public void onPlayerHomeCheck(PlayerTeleportEvent event) throws Exception {
if (event.getPlayer().hasMetadata("NPC")){
if (event.getPlayer().hasMetadata("NPC")) {
return;
}
if (event.getPlayer().hasPermission("factions.homes.bypass")) {

View File

@ -1,7 +1,9 @@
package com.massivecraft.factions.zcore.fperms;
public class DefaultPermissions {
public DefaultPermissions() { }
public DefaultPermissions() {
}
public DefaultPermissions(boolean def) {
this.ban = def;
this.build = def;
@ -31,6 +33,7 @@ public class DefaultPermissions {
this.chest = def;
this.spawner = def;
}
public DefaultPermissions(boolean canBan,
boolean canBuild,
boolean canDestory,
@ -86,6 +89,7 @@ public class DefaultPermissions {
this.chest = canChest;
this.spawner = canSpawners;
}
public boolean ban;
public boolean build;
public boolean destroy;
@ -113,6 +117,7 @@ public class DefaultPermissions {
public boolean withdraw;
public boolean chest;
public boolean spawner;
@Deprecated
public boolean getbyName(String name) {
if (name == "ban") return this.ban;