Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix NPE with invalid attributes and clean up ExprEntityAttribute #5978

Merged
merged 7 commits into from
Sep 17, 2023
Merged

Fix NPE with invalid attributes and clean up ExprEntityAttribute #5978

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f292558
Avoid NPE and clean up class
sovdeeth Sep 8, 2023
72a3ac3
Update ExprEntityAttribute.java
sovdeeth Sep 8, 2023
43c275d
Update src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
Moderocky Sep 15, 2023
670b9b5
Merge branch 'master' into attribute-exception-fix
Moderocky Sep 15, 2023
ad18425
Update src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
AyhamAl-Ali Sep 15, 2023
b78a49e
Merge branch 'dev/feature' into attribute-exception-fix
Moderocky Sep 16, 2023
4f2e539
Merge branch 'dev/feature' into attribute-exception-fix
Moderocky Sep 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 41 additions & 37 deletions src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@
*/
package ch.njol.skript.expressions;

import org.bukkit.attribute.Attribute;

import java.util.stream.Stream;

import org.bukkit.attribute.Attributable;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.entity.Entity;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;

import ch.njol.skript.Skript;
import ch.njol.skript.classes.Changer.ChangeMode;
import ch.njol.skript.doc.Description;
Expand All @@ -40,21 +30,34 @@
import ch.njol.skript.lang.SkriptParser.ParseResult;
import ch.njol.util.Kleenean;
import ch.njol.util.coll.CollectionUtils;
import org.bukkit.attribute.Attributable;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.entity.Entity;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;

import java.util.Objects;
import java.util.stream.Stream;

@Name("Entity Attribute")
@Description({"The numerical value of an entity's particular attribute.",
"Note that the movement speed attribute cannot be reliably used for players. For that purpose, use the speed expression instead.",
"Resetting an entity's attribute is only available in Minecraft 1.11 and above."})
@Examples({"on damage of player:",
" send \"You are wounded!\"",
" set victim's attack speed attribute to 2"})
@Description({
"The numerical value of an entity's particular attribute.",
"Note that the movement speed attribute cannot be reliably used for players. For that purpose, use the speed expression instead.",
"Resetting an entity's attribute is only available in Minecraft 1.11 and above."
})
@Examples({
"on damage of player:",
"\tsend \"You are wounded!\"",
AyhamAl-Ali marked this conversation as resolved.
Show resolved Hide resolved
"\tset victim's attack speed attribute to 2"
})
@Since("2.5, 2.6.1 (final attribute value)")
public class ExprEntityAttribute extends PropertyExpression<Entity, Number> {

static {
Skript.registerExpression(ExprEntityAttribute.class, Number.class, ExpressionType.COMBINED,
"[the] %attributetype% [(1¦(total|final|modified))] attribute [value] of %entities%",
"%entities%'[s] %attributetype% [(1¦(total|final|modified))] attribute [value]");
"[the] %attributetype% [(1:(total|final|modified))] attribute [value] of %entities%",
"%entities%'[s] %attributetype% [(1:(total|final|modified))] attribute [value]");
}

@Nullable
Expand All @@ -72,10 +75,11 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye

@Override
@SuppressWarnings("null")
protected Number[] get(Event e, Entity[] entities) {
Attribute a = attributes.getSingle(e);
protected Number[] get(Event event, Entity[] entities) {
Attribute attribute = attributes.getSingle(event);
return Stream.of(entities)
.map(ent -> getAttribute(ent, a))
.map(ent -> getAttribute(ent, attribute))
.filter(Objects::nonNull)
.map(att -> withModifiers ? att.getValue() : att.getBaseValue())
.toArray(Number[]::new);
}
Expand All @@ -90,27 +94,27 @@ public Class<?>[] acceptChange(ChangeMode mode) {

@Override
@SuppressWarnings("null")
public void change(Event e, @Nullable Object[] delta, ChangeMode mode) {
Attribute a = attributes.getSingle(e);
double d = delta == null ? 0 : ((Number) delta[0]).doubleValue();
for (Entity entity : getExpr().getArray(e)) {
AttributeInstance ai = getAttribute(entity, a);
if(ai != null) {
public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
Attribute attribute = attributes.getSingle(event);
double deltaValue = delta == null ? 0 : ((Number) delta[0]).doubleValue();
for (Entity entity : getExpr().getArray(event)) {
AttributeInstance instance = getAttribute(entity, attribute);
if(instance != null) {
Moderocky marked this conversation as resolved.
Show resolved Hide resolved
switch(mode) {
case ADD:
ai.setBaseValue(ai.getBaseValue() + d);
instance.setBaseValue(instance.getBaseValue() + deltaValue);
break;
case SET:
ai.setBaseValue(d);
instance.setBaseValue(deltaValue);
break;
case DELETE:
ai.setBaseValue(0);
instance.setBaseValue(0);
break;
case RESET:
ai.setBaseValue(ai.getDefaultValue());
instance.setBaseValue(instance.getDefaultValue());
break;
case REMOVE:
ai.setBaseValue(ai.getBaseValue() - d);
instance.setBaseValue(instance.getBaseValue() - deltaValue);
break;
case REMOVE_ALL:
assert false;
Expand All @@ -126,14 +130,14 @@ public Class<? extends Number> getReturnType() {

@Override
@SuppressWarnings("null")
public String toString(@Nullable Event e, boolean debug) {
return "entity " + getExpr().toString(e, debug) + "'s " + (attributes == null ? "" : attributes.toString(e, debug)) + "attribute";
public String toString(@Nullable Event event, boolean debug) {
return "entity " + getExpr().toString(event, debug) + "'s " + (attributes == null ? "" : attributes.toString(event, debug)) + "attribute";
}

@Nullable
private static AttributeInstance getAttribute(Entity e, @Nullable Attribute a) {
if (a != null && e instanceof Attributable) {
return ((Attributable) e).getAttribute(a);
private static AttributeInstance getAttribute(Entity entity, @Nullable Attribute attribute) {
if (attribute != null && entity instanceof Attributable) {
return ((Attributable) entity).getAttribute(attribute);
}
return null;
}
Expand Down