EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-23 05:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix entity util

Browse Source
This commit is contained in:
Alexander Söderberg 2020-02-17 20:05:57 +01:00
parent 95a1b0612f
commit 4c18214da1
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/FlagContainer.java
View File

@ -165,7 +165,7 @@ import java.util.Map;
} }
@SuppressWarnings("ALL") @SuppressWarnings("ALL")
protected static <V, T extends PlotFlag<V, ?>> T castUnsafe(final PlotFlag<?, ?> flag) { public static <V, T extends PlotFlag<V, ?>> T castUnsafe(final PlotFlag<?, ?> flag) {
return (T) flag; return (T) flag;
} }

6
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
View File

@ -3167,6 +3167,12 @@ public class Plot {
return this.flagContainer.getFlag(flagClass).getValue(); return this.flagContainer.getFlag(flagClass).getValue();
} }
public <T, V extends PlotFlag<T, ?>> T getFlag(final V flag) {
final Class<?> flagClass = flag.getClass();
final PlotFlag<?, ?> flagInstance = this.flagContainer.getFlagErased(flagClass);
return FlagContainer.<T, V>castUnsafe(flagInstance).getValue();
}
public boolean setFlag(PlotFlag<?, ?> plotFlag) { public boolean setFlag(PlotFlag<?, ?> plotFlag) {
flagContainer.addFlag(plotFlag); flagContainer.addFlag(plotFlag);
return true; return true;

13
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java
View File

@ -1,8 +1,7 @@
package com.github.intellectualsites.plotsquared.plot.util; package com.github.intellectualsites.plotsquared.plot.util;
import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.config.Settings;;
import com.github.intellectualsites.plotsquared.plot.flag.Flags; import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag;
import com.github.intellectualsites.plotsquared.plot.flag.IntegerFlag;
import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag;
import com.github.intellectualsites.plotsquared.plot.object.Plot; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import lombok.NonNull; import lombok.NonNull;
@ -38,14 +37,14 @@ import lombok.experimental.UtilityClass;
return i; return i;
} }
public static boolean checkEntity(Plot plot, IntegerFlag... flags) { public static boolean checkEntity(Plot plot, PlotFlag<Integer, ?> ... flags) {
if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
return true; return true;
} }
int[] mobs = null; int[] mobs = null;
for (IntegerFlag flag : flags) { for (PlotFlag<Integer, ?> flag : flags) {
final int i = capNumeral(flag.getName()); final int i = capNumeral(flag.getName());
int cap = plot.getFlag(flag, Integer.MAX_VALUE); int cap = plot.getFlag(flag);
if (cap == Integer.MAX_VALUE) { if (cap == Integer.MAX_VALUE) {
continue; continue;
} }
@ -62,7 +61,7 @@ import lombok.experimental.UtilityClass;
} }
} }
if (mobs != null) { if (mobs != null) {
for (IntegerFlag flag : flags) { for (PlotFlag<Integer, ?> flag : flags) {
final int i = capNumeral(flag.getName()); final int i = capNumeral(flag.getName());
mobs[i]++; mobs[i]++;
} }