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

Fix logging caused by wind charges #701

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

Fix logging caused by wind charges #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03933ee
Fixed blocks broken by wind charges not being logged
quintindunn Jan 11, 2025
706e6f9
Fixed wind charges still logging invalid block breaks when they're a …
quintindunn Jan 11, 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
7 changes: 7 additions & 0 deletions src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.bukkit.entity.Ravager;
import org.bukkit.entity.Silverfish;
import org.bukkit.entity.Turtle;
import org.bukkit.entity.WindCharge;
import org.bukkit.entity.Wither;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
Expand All @@ -21,47 +22,53 @@

public final class EntityChangeBlockListener extends Queue implements Listener {

@EventHandler(priority = EventPriority.MONITOR)
protected void onEntityChangeBlock(EntityChangeBlockEvent event) {
World world = event.getBlock().getWorld();
if (!event.isCancelled() && Config.getConfig(world).ENTITY_CHANGE) {
Entity entity = event.getEntity(); // Can be sand/gravel
Block block = event.getBlock();
Material newtype = event.getTo();
Material type = event.getBlock().getType();
String e = "";
if (entity instanceof Enderman) {
e = "#enderman";
}
else if (entity instanceof EnderDragon) {
e = "#enderdragon";
}
else if (entity instanceof Fox) {
e = "#fox";
}
else if (entity instanceof Wither) {
e = "#wither";
}
else if (entity instanceof Turtle) {
e = "#turtle";
}
else if (entity instanceof Ravager) {
e = "#ravager";
}
else if (entity instanceof Silverfish) {
if (newtype.equals(Material.AIR) || newtype.equals(Material.CAVE_AIR)) {
e = "#silverfish";
}
}
else if (entity instanceof WindCharge) {
e = "#windcharge";
}
else if (entity.getType().name().equals("BREEZE_WIND_CHARGE")) {
e = "#breezewindcharge";
}
if (e.length() > 0) {
if (newtype.equals(Material.AIR) || newtype.equals(Material.CAVE_AIR)) {
Queue.queueBlockBreak(e, block.getState(), type, block.getBlockData().getAsString(), 0);
}
else {
queueBlockPlace(e, block.getState(), type, block.getState(), newtype, -1, 0, event.getBlockData().getAsString());
}
}
}
}

Check notice on line 73 in src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java

View check run for this annotation

codefactor.io / CodeFactor

src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java#L25-L73 

Complex Method
}
2 changes: 1 addition & 1 deletion src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public final class EntityExplodeListener extends Queue implements Listener {
@EventHandler(priority = EventPriority.MONITOR)
protected void onEntityExplode(EntityExplodeEvent event) {
Entity entity = event.getEntity();
if (entity.getType().name().equals("WIND_CHARGE")) {
if (entity.getType().name().equals("WIND_CHARGE") || entity.getType().name().equals("BREEZE_WIND_CHARGE")) {
return;
}

Expand Down