Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/events/EvtEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public boolean init(final Literal<?>[] args, final int matchedPattern, final Par
}
} else {
for (final EntityData<?> d : types) {
if (!LivingEntity.class.isAssignableFrom(d.getType())) {
if (!LivingEntity.class.isAssignableFrom(d.getType()) && d.getType() != Entity.class) {
Skript.error("The death event only works for living entities", ErrorQuality.SEMANTIC_ERROR);
return false;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.skriptlang.skript.test.tests.syntaxes.events;

import ch.njol.skript.test.runner.SkriptJUnitTest;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Sheep;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

public class EvtEntityTest extends SkriptJUnitTest {

static {
setShutdownDelay(1);
}

private Sheep sheep;

@Before
public void before() {
sheep = spawnTestEntity(EntityType.SHEEP);
}

@After
public void after() {
sheep.remove();
}

@Test
public void test() {
sheep.setHealth(0);
}
}
16 changes: 16 additions & 0 deletions src/test/skript/junit/EvtEntity.sk
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
test "EvtEntityJUnit" when running JUnit:
set {_tests::1} to "generic - entity death fires"
set {_tests::2} to "specific - entity death fires"
ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtEntityTest" completes {_tests::*}

on death of an entity:
set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtEntityTest"
junit test is {_test}
if victim is a sheep:
complete objective "generic - entity death fires" for {_test}

on death of a sheep:
set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtEntityTest"
junit test is {_test}
if victim is a sheep:
complete objective "specific - entity death fires" for {_test}
Loading