minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-12 09:35:26 +02:00
Code Issues Releases Wiki Activity

Revert "Remove Transient :: Formatting Cleanup"

Browse Source
This commit is contained in:
Iaccidentally
2013-01-14 20:06:28 -05:00
parent 8e54bf13b2
commit 2a097530e5
198 changed files with 1202 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
View File

@@ -11,8 +11,8 @@ import org.bukkit.plugin.Plugin;
public class EssentialsConnect
{
private static final Logger LOGGER = Logger.getLogger("Minecraft");
private final IEssentials ess;
private final IProtect protect;
private final transient IEssentials ess;
private final transient IProtect protect;
public EssentialsConnect(final Plugin essPlugin, final Plugin essProtect)
{

4
EssentialsProtect/src/net/ess3/protect/EssentialsProtect.java
View File

@@ -11,8 +11,8 @@ import org.bukkit.plugin.java.JavaPlugin;
public class EssentialsProtect extends JavaPlugin implements IProtect
{
private static final Logger LOGGER = Logger.getLogger("Minecraft");
private EssentialsConnect ess = null;
private ProtectHolder settings = null;
private transient EssentialsConnect ess = null;
private transient ProtectHolder settings = null;
@Override
public void onEnable()

2
EssentialsProtect/src/net/ess3/protect/EssentialsProtectBlockListener.java
View File

@@ -13,7 +13,7 @@ import org.bukkit.event.block.BlockIgniteEvent;
public class EssentialsProtectBlockListener implements Listener
{
final private IProtect prot;
final private transient IProtect prot;
public EssentialsProtectBlockListener(final IProtect parent)
{

25
EssentialsProtect/src/net/ess3/protect/EssentialsProtectEntityListener.java
View File

@@ -11,7 +11,7 @@ import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
//TODO: remove unnecessary return statements
public class EssentialsProtectEntityListener implements Listener
{
private final IProtect prot;
private final transient IProtect prot;
public EssentialsProtectEntityListener(final IProtect prot)
{
@@ -47,7 +47,7 @@ public class EssentialsProtectEntityListener implements Listener
return;
}
if (cause == DamageCause.BLOCK_EXPLOSION && (Permissions.PREVENTDAMAGE_TNT.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(
user)))
user)))
{
event.setCancelled(true);
return;
@@ -69,21 +69,21 @@ public class EssentialsProtectEntityListener implements Listener
//Creeper explode prevention
if (eAttack instanceof Creeper && settings.getData().getPrevent().isCreeperExplosion() || (Permissions.PREVENTDAMAGE_CREEPER.isAuthorized(
user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
{
event.setCancelled(true);
return;
}
if ((event.getEntity() instanceof Fireball || event.getEntity() instanceof SmallFireball) && (Permissions.PREVENTDAMAGE_FIREBALL.isAuthorized(
user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
{
event.setCancelled(true);
return;
}
if ((event.getEntity() instanceof WitherSkull && Permissions.PREVENTDAMAGE_WITHERSKULL.isAuthorized(
user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
{
event.setCancelled(true);
return;
@@ -96,9 +96,9 @@ public class EssentialsProtectEntityListener implements Listener
}
if (edEvent.getDamager() instanceof Projectile && ((Permissions.PREVENTDAMAGE_PROJECTILES.isAuthorized(
user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(
user)) || (((Projectile)edEvent.getDamager()).getShooter() instanceof Player && (!Permissions.PVP.isAuthorized(
user) || !Permissions.PVP.isAuthorized((Player)((Projectile)edEvent.getDamager()).getShooter())))))
user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(
user)) || (((Projectile)edEvent.getDamager()).getShooter() instanceof Player && (!Permissions.PVP.isAuthorized(
user) || !Permissions.PVP.isAuthorized((Player)((Projectile)edEvent.getDamager()).getShooter())))))
{
event.setCancelled(true);
return;
@@ -115,13 +115,13 @@ public class EssentialsProtectEntityListener implements Listener
}
if (cause == DamageCause.SUFFOCATION && (Permissions.PREVENTDAMAGE_SUFFOCATION.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(
user)))
user)))
{
event.setCancelled(true);
return;
}
if ((cause == DamageCause.FIRE || cause == DamageCause.FIRE_TICK) && (Permissions.PREVENTDAMAGE_FIRE.isAuthorized(
user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(user)))
{
event.setCancelled(true);
return;
@@ -132,7 +132,7 @@ public class EssentialsProtectEntityListener implements Listener
return;
}
if (cause == DamageCause.LIGHTNING && (Permissions.PREVENTDAMAGE_LIGHTNING.isAuthorized(user) && !Permissions.PREVENTDAMAGE_NONE.isAuthorized(
user)))
user)))
{
event.setCancelled(true);
}
@@ -143,8 +143,7 @@ public class EssentialsProtectEntityListener implements Listener
}
}
}
// return statements are probably not needed here
// return statements are probably not needed here
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onEntityExplode(final EntityExplodeEvent event)
{

2
EssentialsProtect/src/net/ess3/protect/EssentialsProtectWeatherListener.java
View File

@@ -10,7 +10,7 @@ import org.bukkit.event.weather.WeatherChangeEvent;
public class EssentialsProtectWeatherListener implements Listener
{
private final IProtect prot;
private final transient IProtect prot;
public EssentialsProtectWeatherListener(final IProtect prot)
{

3
EssentialsProtect/src/net/ess3/protect/Permissions.java
View File

@@ -29,7 +29,7 @@ public enum Permissions implements IPermission
private static final String base = "essentials.protect.";
private final String permission;
private final PermissionDefault defaultPerm;
private String parent = null;
private transient String parent = null;
private Permissions()
{
@@ -72,5 +72,6 @@ public enum Permissions implements IPermission
{
return PermissionFactory.checkPermission(sender, this);
}
public static DotStarPermission ENTITY_TARGET_BYPASS = new DotStarPermission("essentials.protect.entitytarget.bypass");
}