Skip to content

Repository navigation

test-entitydead: entity dead/spool fixes #2

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

Draft
MLG-SERBUR wants to merge 8 commits into
base: enum-validator
Choose a base branch
from
Draft

test-entitydead: entity dead/spool fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
81238f5
fix: stop operating on dead entity in EntitySpinner spin loop
MLG-SERBUR Aug 21, 2026
6207aa8
fix: load espinner chunk synchronously and retry on ChunkLoadEvent
MLG-SERBUR Aug 21, 2026
8815d24
fix: re-acquire live entity by UUID before declaring dead; add diagno…
MLG-SERBUR Aug 21, 2026
c30583e
fix: prevent re-entrant double-spool of espinner
MLG-SERBUR Aug 22, 2026
b607630
diag: log entity state transitions; drop forced chunk load
MLG-SERBUR Aug 22, 2026
f86b6b7
fix: simplify entity resolution logic in EntitySpinner; remove stale …
MLG-SERBUR Aug 22, 2026
3b02218
refactor: streamline entity resolution in EntitySpinner; replace reso…
MLG-SERBUR Aug 22, 2026
31a5569
fix: improve entity validation in EntitySpinner; replace refreshEntit…
MLG-SERBUR Aug 22, 2026
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
47 changes: 25 additions & 22 deletions src/main/java/net/awesomepowered/rotator/RotatoR.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,30 +148,33 @@ public void spoolSpinners() {
} else {
for (String s : getConfig().getConfigurationSection("espinner").getKeys(false)) {
debug("Loading espinner", s);
String location = getConfig().getString("espinner."+s+".loc");
if (location != null) {
Location loc = stringToLoc(location);
if (loc != null && loc.getWorld() != null) {
loc.getChunk().load(false);
}
UUID uuid = UUID.fromString(s);
if (entitySpinners.containsKey(uuid)) {
continue;
}
Entity entity = Bukkit.getEntity(uuid);
if (entity == null) {
getLogger().log(Level.WARNING, "[espinner] Entity " + s + " not loaded, skipping spool.");
continue;
}
Entity entity = Bukkit.getEntity(UUID.fromString(s));
if (entity != null && !entitySpinners.containsKey(UUID.fromString(s)) && Spinner.isSpinnable(entity)) {
debug("It's espinnable");
String sound = getConfig().getString("espinner."+s+".sound");
String effect = getConfig().getString("espinner."+s+".effect");
String particle = getConfig().getString("espinner."+s+".particle");
int rpm = getConfig().getInt("espinner."+s+".rpm", this.rpm);
double yaw = getConfig().getDouble("espinner."+s+".yaw", 12.5);
EntitySpinner entitySpinner = new EntitySpinner(entity, 0, rpm);
entitySpinner.setEffect(effect);
entitySpinner.setSound(sound);
entitySpinner.setParticle(particle);
entitySpinner.setYawChange(yaw);
debug( "Main", "Spooling up espinner id " + s, "RPM: " + rpm, "Sound: " + sound, "Effect: " + effect, "Particle: " + particle, "Yaw: " + yaw);
entitySpinner.spoolUp();
entitySpinners.put(UUID.fromString(s), entitySpinner);
if (entity.isDead() || !Spinner.isSpinnable(entity)) {
getLogger().log(Level.WARNING, "[espinner] Entity " + s + " is "
+ (entity.isDead() ? "dead" : "not spinnable") + ", skipping spool.");
continue;
}
String sound = getConfig().getString("espinner." + s + ".sound");
String effect = getConfig().getString("espinner." + s + ".effect");
String particle = getConfig().getString("espinner." + s + ".particle");
int rpm = getConfig().getInt("espinner." + s + ".rpm", this.rpm);
double yaw = getConfig().getDouble("espinner." + s + ".yaw", 12.5);
EntitySpinner entitySpinner = new EntitySpinner(entity, 0, rpm);
entitySpinner.setEffect(effect);
entitySpinner.setSound(sound);
entitySpinner.setParticle(particle);
entitySpinner.setYawChange(yaw);
debug("Main", "Spooling up espinner id " + s, "RPM: " + rpm, "Sound: " + sound, "Effect: " + effect, "Particle: " + particle, "Yaw: " + yaw);
entitySpinner.spoolUp();
entitySpinners.put(uuid, entitySpinner);
}
}

Expand Down
29 changes: 14 additions & 15 deletions src/main/java/net/awesomepowered/rotator/types/EntitySpinner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.Rotation;
import org.bukkit.Sound;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Entity;
import org.bukkit.entity.ItemFrame;
import org.bukkit.entity.LivingEntity;

import java.util.logging.Level;

public class EntitySpinner implements Spinnable {

private Entity entity;
Expand Down Expand Up @@ -133,14 +130,15 @@ public void spoolUp() {
if (rotatorSpinEvent.isCancelled()) {
return;
}
if (entity.isDead()) {
RotatoR.getMain().getLogger().log(Level.WARNING, "Oh noes! An entity is ded!");
selfDestruct();
}
if (!entity.isValid()) {
if (!entity.isValid() || entity.isDead()) {
Entity newEntity = Bukkit.getEntity(entity.getUniqueId());
if (newEntity == null)
if (newEntity == null) {
return;
}
if (newEntity.isDead()) {
selfDestruct();
return;
}
entity = newEntity;
}
ItemFrame itemFrame = (ItemFrame) entity;
Expand All @@ -159,14 +157,15 @@ public void spoolUp() {
if (rotatorSpinEvent.isCancelled()) {
return;
}
if (entity.isDead()) {
RotatoR.getMain().getLogger().log(Level.WARNING, "Oh noes! An entity is ded!");
selfDestruct();
}
if (!entity.isValid()) {
if (!entity.isValid() || entity.isDead()) {
Entity newEntity = Bukkit.getEntity(entity.getUniqueId());
if (newEntity == null)
if (newEntity == null) {
return;
}
if (newEntity.isDead()) {
selfDestruct();
return;
}
entity = newEntity;
}
constant.setYaw((float) trouble.getAndAdd(yawChange) % 360); //shhh
Expand Down