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

Fixed grace period issues!

Browse Source
This commit is contained in:
DroppingAnvil 2019-09-17 17:28:32 -05:00
parent b29dd64581
commit a3b819cda3
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
View File

@ -470,24 +470,18 @@ public class FactionsBlockListener implements Listener {
//Grace //Grace
@EventHandler @EventHandler
public void onBreak(EntityExplodeEvent e) { public void onBreak(EntityExplodeEvent e) {
if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-grace.Enabled")) if (!Conf.gracePeriod) return;
return;
if (!graceisEnabled()) { e.setCancelled(true);
e.setCancelled(true);
}
} }
@EventHandler @EventHandler
public void entityDamage(EntityDamageEvent e) { public void entityDamage(EntityDamageEvent e) {
if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-grace.Enabled")) if (!Conf.gracePeriod) return;
return;
if (!graceisEnabled()) {
if (e.getEntity() instanceof Player) { if (e.getEntity() instanceof Player) {
if (e.getCause() == EntityDamageEvent.DamageCause.PROJECTILE) { if (e.getCause() == EntityDamageEvent.DamageCause.PROJECTILE) {
e.setCancelled(true); e.setCancelled(true);
}
} }
} }
} }
@ -495,10 +489,9 @@ public class FactionsBlockListener implements Listener {
@EventHandler @EventHandler
public void onTNTPlace(BlockPlaceEvent e1) { public void onTNTPlace(BlockPlaceEvent e1) {
FPlayer fp = FPlayers.getInstance().getByPlayer(e1.getPlayer()); FPlayer fp = FPlayers.getInstance().getByPlayer(e1.getPlayer());
if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-grace.Enabled")) if (!Conf.gracePeriod) return;
return;
if (!graceisEnabled() && !fp.isAdminBypassing()) { if (!fp.isAdminBypassing()) {
if (e1.getBlock().getType().equals(Material.TNT)) { if (e1.getBlock().getType().equals(Material.TNT)) {
e1.setCancelled(true); e1.setCancelled(true);