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

Merge pull request #17 from DroppingAnvil/1.6.x

Browse Source 
Fixed grace period issues!
This commit is contained in:
Driftay 2019-09-17 19:29:07 -04:00 committed by GitHub
commit 4046ab62e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -477,24 +477,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);
}
} }
} }
} }
@ -502,10 +496,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);