Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Magnus Ulf 2019-05-03 09:25:30 +02:00
parent 5440987d8d
commit 28604c1d9a
7 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/massivecore/SimpleConfig.java
View File

@ -67,7 +67,7 @@ public class SimpleConfig
{
try
{
toShallowLoad = this.getClass().newInstance();
toShallowLoad = this.getClass().getDeclaredConstructor().newInstance();
}
catch (Exception e)
{

18
src/com/massivecraft/massivecore/command/type/enumeration/TypePermissionDefault.java Normal file
View File

@ -0,0 +1,18 @@
package com.massivecraft.massivecore.command.type.enumeration;
import org.bukkit.permissions.PermissionDefault;
public class TypePermissionDefault extends TypeEnum<PermissionDefault>
{
// -------------------------------------------- //
// INSTANCE & CONSTRUCT
// -------------------------------------------- //
private static TypePermissionDefault i = new TypePermissionDefault();
public static TypePermissionDefault get() { return i; }
public TypePermissionDefault()
{
super(PermissionDefault.class);
}
}

11
src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java
View File

@ -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)

2
src/com/massivecraft/massivecore/store/EntityContainerAbstract.java
View File

@ -214,7 +214,7 @@ public abstract class EntityContainerAbstract<E extends EntityInternal<E>> imple
{
try
{
return this.getEntityClass().newInstance();
return this.getEntityClass().getDeclaredConstructor().newInstance();
}
catch (Exception e)
{

4
src/com/massivecraft/massivecore/util/ChunkUtil.java
View File

@ -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);
}

2
src/com/massivecraft/massivecore/util/ReflectionUtil.java
View File

@ -213,7 +213,7 @@ public class ReflectionUtil
{
try
{
return (T) clazz.newInstance();
return (T) clazz.getDeclaredConstructor().newInstance();
}
catch (Exception e)
{

4
src/com/massivecraft/massivecore/util/Txt.java
View File

@ -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);
}