diff --git a/src/com/massivecraft/massivecore/SimpleConfig.java b/src/com/massivecraft/massivecore/SimpleConfig.java index 6b008963..cab74c88 100644 --- a/src/com/massivecraft/massivecore/SimpleConfig.java +++ b/src/com/massivecraft/massivecore/SimpleConfig.java @@ -67,7 +67,7 @@ public class SimpleConfig { try { - toShallowLoad = this.getClass().newInstance(); + toShallowLoad = this.getClass().getDeclaredConstructor().newInstance(); } catch (Exception e) { diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypePermissionDefault.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypePermissionDefault.java new file mode 100644 index 00000000..2562b74b --- /dev/null +++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypePermissionDefault.java @@ -0,0 +1,18 @@ +package com.massivecraft.massivecore.command.type.enumeration; + +import org.bukkit.permissions.PermissionDefault; + +public class TypePermissionDefault extends TypeEnum +{ + // -------------------------------------------- // + // INSTANCE & CONSTRUCT + // -------------------------------------------- // + + private static TypePermissionDefault i = new TypePermissionDefault(); + public static TypePermissionDefault get() { return i; } + public TypePermissionDefault() + { + super(PermissionDefault.class); + } + +} diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java index 17ee1cba..3f1b961b 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java @@ -2,7 +2,7 @@ package com.massivecraft.massivecore.event; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.util.MUtil; -import org.bukkit.entity.Damageable; +import org.bukkit.attribute.Attribute; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; @@ -113,7 +113,7 @@ public class EventMassiveCorePlayerUpdate extends EventMassiveCore if (getMaxHealth(player) == maxHealth) return false; // Apply - player.setMaxHealth(maxHealth); + player.getAttribute(Attribute.GENERIC_MAX_HEALTH).setBaseValue(maxHealth); // Return return true; @@ -121,10 +121,9 @@ public class EventMassiveCorePlayerUpdate extends EventMassiveCore public static double getMaxHealth(Player player, boolean current) { - if ( ! current) return 20D; - - Damageable d = (Damageable) player; - return d.getMaxHealth(); + if ( ! current) player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue(); + + return player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getBaseValue(); } public static double getMaxHealth(Player player) diff --git a/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java b/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java index b692c268..88f16b66 100644 --- a/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java +++ b/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java @@ -214,7 +214,7 @@ public abstract class EntityContainerAbstract> imple { try { - return this.getEntityClass().newInstance(); + return this.getEntityClass().getDeclaredConstructor().newInstance(); } catch (Exception e) { diff --git a/src/com/massivecraft/massivecore/util/ChunkUtil.java b/src/com/massivecraft/massivecore/util/ChunkUtil.java index 2495e0e7..effe59fd 100644 --- a/src/com/massivecraft/massivecore/util/ChunkUtil.java +++ b/src/com/massivecraft/massivecore/util/ChunkUtil.java @@ -1,9 +1,9 @@ package com.massivecraft.massivecore.util; import com.massivecraft.massivecore.collections.MassiveSet; -import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.ps.PS; +import java.util.function.Predicate; import java.util.Set; public class ChunkUtil @@ -89,7 +89,7 @@ public class ChunkUtil for (PS neighbour : neighbours) { if (set.contains(neighbour)) continue; - if ( ! matcher.apply(neighbour)) continue; + if ( ! matcher.test(neighbour)) continue; expansion.add(neighbour); } diff --git a/src/com/massivecraft/massivecore/util/ReflectionUtil.java b/src/com/massivecraft/massivecore/util/ReflectionUtil.java index b25716b4..4d2d4ac0 100644 --- a/src/com/massivecraft/massivecore/util/ReflectionUtil.java +++ b/src/com/massivecraft/massivecore/util/ReflectionUtil.java @@ -213,7 +213,7 @@ public class ReflectionUtil { try { - return (T) clazz.newInstance(); + return (T) clazz.getDeclaredConstructor().newInstance(); } catch (Exception e) { diff --git a/src/com/massivecraft/massivecore/util/Txt.java b/src/com/massivecraft/massivecore/util/Txt.java index 3f818b96..c1cacb42 100644 --- a/src/com/massivecraft/massivecore/util/Txt.java +++ b/src/com/massivecraft/massivecore/util/Txt.java @@ -5,7 +5,6 @@ import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.mson.MsonEvent; -import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.predicate.PredicateStartsWithIgnoreCase; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -23,6 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -852,7 +852,7 @@ public class Txt // Fill Ret for (T element : elements) { - if ( ! predicate.apply(element)) continue; + if ( ! predicate.test(element)) continue; ret.add(element); }