Ident correction.

Last branch had a bad intend due to some misconfiguration on my side.
This commit is contained in:
Liz3 2019-03-03 05:10:25 +01:00
parent bb7d32bb92
commit b10d0caafa
232 changed files with 26900 additions and 26895 deletions

View File

@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableMap;
import com.massivecraft.factions.integration.dynmap.DynmapStyle; import com.massivecraft.factions.integration.dynmap.DynmapStyle;
import com.massivecraft.factions.util.MultiversionMaterials; import com.massivecraft.factions.util.MultiversionMaterials;
import com.massivecraft.factions.zcore.fperms.DefaultPermissions; import com.massivecraft.factions.zcore.fperms.DefaultPermissions;
import com.massivecraft.factions.zcore.fperms.PermissableAction;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.EntityType; 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 setPermission(Permissable permissable, PermissableAction permissableAction, Access access);
void resetPerms(); void resetPerms();
void setDefaultPerms(); void setDefaultPerms();
void disband(Player disbander); void disband(Player disbander);

View File

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

View File

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