Fixes some incompatibility between final and stupid reflection

This commit is contained in:
2023-06-24 03:48:33 +02:00
parent 75140cf97b
commit 8900d01f56
114 changed files with 246 additions and 235 deletions

View File

@@ -32,7 +32,7 @@ public class EngineCanCombatHappen extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineCanCombatHappen i = new EngineCanCombatHappen();
protected static EngineCanCombatHappen i = new EngineCanCombatHappen();
public static EngineCanCombatHappen get() {
return i;
@@ -129,7 +129,7 @@ public class EngineCanCombatHappen extends Engine {
}
public boolean canCombatDamageHappen(EntityDamageByEntityEvent event, boolean notify) {
boolean ret = true;
boolean ret;
// If the defender is a player ...
Entity edefender = event.getEntity();

View File

@@ -28,7 +28,7 @@ public class EngineChat extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineChat i = new EngineChat();
protected static EngineChat i = new EngineChat();
public static EngineChat get() {
return i;

View File

@@ -30,7 +30,7 @@ public class EngineChunkChange extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineChunkChange i = new EngineChunkChange();
protected static EngineChunkChange i = new EngineChunkChange();
public static EngineChunkChange get() {
return i;

View File

@@ -17,7 +17,7 @@ public class EngineCleanInactivity extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineCleanInactivity i = new EngineCleanInactivity();
protected static EngineCleanInactivity i = new EngineCleanInactivity();
public static EngineCleanInactivity get() {
return i;

View File

@@ -22,7 +22,7 @@ public class EngineDenyCommands extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineDenyCommands i = new EngineDenyCommands();
protected static EngineDenyCommands i = new EngineDenyCommands();
public static EngineDenyCommands get() {
return i;

View File

@@ -25,7 +25,7 @@ public class EngineDenyTeleport extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineDenyTeleport i = new EngineDenyTeleport();
protected static EngineDenyTeleport i = new EngineDenyTeleport();
public static EngineDenyTeleport get() {
return i;

View File

@@ -39,7 +39,7 @@ public class EngineEcon extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineEcon i = new EngineEcon();
protected static EngineEcon i = new EngineEcon();
public static EngineEcon get() {
return i;
@@ -167,8 +167,8 @@ public class EngineEcon extends Engine {
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void payForAction(EventFactionsMembershipChange event) {
Double cost = null;
String desc = null;
double cost;
String desc;
if (event.getReason() == MembershipChangeReason.JOIN) {
cost = MConf.get().econCostJoin;

View File

@@ -26,7 +26,7 @@ public class EngineExploit extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineExploit i = new EngineExploit();
protected static EngineExploit i = new EngineExploit();
public static EngineExploit get() {
return i;

View File

@@ -16,7 +16,7 @@ public class EngineFlagEndergrief extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineFlagEndergrief i = new EngineFlagEndergrief();
protected static EngineFlagEndergrief i = new EngineFlagEndergrief();
public static EngineFlagEndergrief get() {
return i;

View File

@@ -32,7 +32,7 @@ public class EngineFlagExplosion extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineFlagExplosion i = new EngineFlagExplosion();
protected static EngineFlagExplosion i = new EngineFlagExplosion();
public static EngineFlagExplosion get() {
return i;

View File

@@ -20,7 +20,7 @@ public class EngineFlagFireSpread extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineFlagFireSpread i = new EngineFlagFireSpread();
protected static EngineFlagFireSpread i = new EngineFlagFireSpread();
public static EngineFlagFireSpread get() {
return i;

View File

@@ -21,7 +21,7 @@ public class EngineFlagSpawn extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineFlagSpawn i = new EngineFlagSpawn();
protected static EngineFlagSpawn i = new EngineFlagSpawn();
public static EngineFlagSpawn get() {
return i;

View File

@@ -16,7 +16,7 @@ public class EngineFlagZombiegrief extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineFlagZombiegrief i = new EngineFlagZombiegrief();
protected static EngineFlagZombiegrief i = new EngineFlagZombiegrief();
public static EngineFlagZombiegrief get() {
return i;

View File

@@ -30,7 +30,7 @@ public class EngineFly extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineFly i = new EngineFly();
protected static EngineFly i = new EngineFly();
public static EngineFly get() {
return i;

View File

@@ -16,7 +16,7 @@ public class EngineLastActivity extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineLastActivity i = new EngineLastActivity();
protected static EngineLastActivity i = new EngineLastActivity();
public static EngineLastActivity get() {
return i;

View File

@@ -21,7 +21,7 @@ public class EngineMotd extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineMotd i = new EngineMotd();
protected static EngineMotd i = new EngineMotd();
public static EngineMotd get() {
return i;

View File

@@ -24,7 +24,7 @@ public class EngineMoveChunk extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineMoveChunk i = new EngineMoveChunk();
protected static EngineMoveChunk i = new EngineMoveChunk();
public static EngineMoveChunk get() {
return i;

View File

@@ -53,7 +53,7 @@ public class EnginePermBuild extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EnginePermBuild i = new EnginePermBuild();
protected static EnginePermBuild i = new EnginePermBuild();
public static EnginePermBuild get() {
return i;
@@ -206,7 +206,7 @@ public class EnginePermBuild extends Engine {
public void build(EntityChangeBlockEvent event) {
// Handling lilypads being broken by boats
Entity entity = event.getEntity();
if (entity.getType() != EntityType.BOAT || entity.getPassengers().size() <= 0) {
if (entity.getType() != EntityType.BOAT || entity.getPassengers().size() == 0) {
return;
}
Entity player = entity.getPassengers().stream().filter(MUtil::isPlayer).findAny().orElse(entity);

View File

@@ -14,7 +14,7 @@ public class EnginePlayerData extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EnginePlayerData i = new EnginePlayerData();
protected static EnginePlayerData i = new EnginePlayerData();
public static EnginePlayerData get() {
return i;

View File

@@ -21,7 +21,7 @@ public class EnginePower extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EnginePower i = new EnginePower();
protected static EnginePower i = new EnginePower();
public static EnginePower get() {
return i;

View File

@@ -24,7 +24,7 @@ public class EngineSeeChunk extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineSeeChunk i = new EngineSeeChunk();
protected static EngineSeeChunk i = new EngineSeeChunk();
public static EngineSeeChunk get() {
return i;

View File

@@ -56,7 +56,7 @@ public class EngineShow extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineShow i = new EngineShow();
protected static EngineShow i = new EngineShow();
public static EngineShow get() {
return i;

View File

@@ -19,7 +19,7 @@ public class EngineTeleportHomeOnDeath extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineTeleportHomeOnDeath i = new EngineTeleportHomeOnDeath();
protected static EngineTeleportHomeOnDeath i = new EngineTeleportHomeOnDeath();
public static EngineTeleportHomeOnDeath get() {
return i;
@@ -55,7 +55,7 @@ public class EngineTeleportHomeOnDeath extends Engine {
}
// ... and the faction has a home ...
List<Warp> warps = faction.getWarps().getAll((java.util.function.Predicate<Warp>) (warp -> warp.getName().equalsIgnoreCase(MConf.get().warpsTeleportToOnDeathName)));
List<Warp> warps = faction.getWarps().getAll(warp -> warp.getName().equalsIgnoreCase(MConf.get().warpsTeleportToOnDeathName));
if (warps.isEmpty()) {
return;
}
@@ -63,7 +63,7 @@ public class EngineTeleportHomeOnDeath extends Engine {
Warp warp = warps.get(0);
// ... and the home is translatable ...
Location respawnLocation = null;
Location respawnLocation;
try {
respawnLocation = warp.getLocation().asBukkitLocation(true);
} catch (Exception e) {

View File

@@ -17,7 +17,7 @@ public class EngineTerritoryShield extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineTerritoryShield i = new EngineTerritoryShield();
protected static EngineTerritoryShield i = new EngineTerritoryShield();
public static EngineTerritoryShield get() {
return i;

View File

@@ -12,7 +12,7 @@ public class EngineVisualizations extends Engine {
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static final EngineVisualizations i = new EngineVisualizations();
protected static EngineVisualizations i = new EngineVisualizations();
public static EngineVisualizations get() {
return i;