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

FoxData - fixes #2536

Merged
merged 3 commits into from
Oct 10, 2019
Merged

FoxData - fixes #2536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8865485
FoxData - fixes
ShaneBeee Oct 8, 2019
f93e3b8
Merge branch 'master' into fix/foxes
ShaneBeee Oct 8, 2019
0ce3fa4
FoxData - tests
ShaneBeee Oct 8, 2019
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/entity/FoxData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void set(Fox entity) {

@Override
protected boolean match(Fox entity) {
return type == entity.getFoxType();
return type == null || type == entity.getFoxType();
}

@Override
Expand Down
1 change: 0 additions & 1 deletion src/main/java/ch/njol/skript/entity/SimpleEntityData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,6 @@ public boolean equals(final @Nullable Object obj) {
}

if (Skript.isRunningMinecraft(1, 14)) {
types.add(new SimpleEntityDataInfo("fox", Fox.class));
types.add(new SimpleEntityDataInfo("pillager", Pillager.class));
types.add(new SimpleEntityDataInfo("ravager", Ravager.class));

Expand Down
5 changes: 5 additions & 0 deletions src/test/skript/tests/regressions/2536-FoxData fixes.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
test "fox entityData fixes":
spawn red fox at location(0, 64, 0, world "world")
spawn 3 snow foxes at location(0, 64, 0, world "world")
delete all foxes
assert size of all foxes = 0 with "all foxes not deleted:%size of all foxes%"