Skip to content

Bug fix for villager breeding not being cancellable #2714

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

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Bug fix for villager breeding not being cancellable #2714

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e93e3f5
Fixed villager breeding not being cancellable
MC-Samuel Apr 7, 2025
f802a19
aya update
MC-Samuel Apr 13, 2025
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
54 changes: 22 additions & 32 deletions plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityBreedScriptEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
import com.denizenscript.denizen.events.BukkitScriptEvent;
import com.denizenscript.denizencore.objects.core.ElementTag;
import com.denizenscript.denizencore.objects.ObjectTag;
import org.bukkit.entity.Animals;
import org.bukkit.entity.Entity;
import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityBreedEvent;
Expand Down Expand Up @@ -40,6 +39,13 @@ public class EntityBreedScriptEvent extends BukkitScriptEvent implements Listene

public EntityBreedScriptEvent() {
registerCouldMatcher("<entity> breeds");
this.<EntityBreedScriptEvent, ElementTag>registerOptionalDetermination(null, ElementTag.class, (evt, context, determination) -> {
if (determination.isInt()) {
evt.event.setExperience(determination.asInt());
return true;
}
return false;
});
}

private EntityTag entity;
Expand All @@ -61,46 +67,30 @@ public boolean matches(ScriptPath path) {
return super.matches(path);
}

@Override
public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
if (determinationObj instanceof ElementTag element && element.isInt()) {
experience = element.asInt();
event.setExperience(experience);
return true;
}
return super.applyDetermination(path, determinationObj);
}

@Override
public ObjectTag getContext(String name) {
if (name.equals("child")) {
return entity.getDenizenObject();
}
else if (name.equals("breeder") && breeder != null) {
return breeder.getDenizenObject();
}
else if (name.equals("father")) {
return father.getDenizenObject();
}
else if (name.equals("mother")) {
return mother.getDenizenObject();
}
else if (name.equals("item") && item != null) {
return item;
}
else if (name.equals("experience")) {
return new ElementTag(experience);
}
return super.getContext(name);
return switch (name) {
case "child" -> entity.getDenizenObject();
case "breeder" -> breeder == null ? null : breeder.getDenizenObject();
case "father" -> father.getDenizenObject();
case "mother" -> mother.getDenizenObject();
case "item" -> item;
case "experience" -> new ElementTag(experience);
default -> super.getContext(name);
};
}

@Override
public void cancellationChanged() {
// Prevent entities from continuing to breed with each other
if (cancelled) {
if (cancelled && entity.getBukkitEntity() instanceof Animals) {
((Animals) father.getLivingEntity()).setLoveModeTicks(0);
((Animals) mother.getLivingEntity()).setLoveModeTicks(0);
}
else if (cancelled && entity.getBukkitEntity() instanceof Villager) {
((Villager) father.getLivingEntity()).getInventory().clear();
((Villager) mother.getLivingEntity()).getInventory().clear();
}
super.cancellationChanged();
}

Expand Down