zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Fixed backwards compatibility

Browse source
This commit is contained in:
Intelli 2025-04-09 19:58:24 -06:00
parent 068542223d
commit 898bcf2465
7 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -154,7 +154,7 @@
<dependency> <dependency>
<groupId>io.papermc.paper</groupId> <groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId> <artifactId>paper-api</artifactId>
<version>1.21.4-R0.1-SNAPSHOT</version> <version>1.21.1-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java
View file

@ -54,7 +54,7 @@ public final class EntityChangeBlockListener extends Queue implements Listener {
e = "#silverfish"; e = "#silverfish";
} }
} }
else if (entity instanceof WindCharge) { else if (entity.getType().name().equals("WIND_CHARGE")) {
e = "#windcharge"; e = "#windcharge";
} }
else if (entity.getType().name().equals("BREEZE_WIND_CHARGE")) { else if (entity.getType().name().equals("BREEZE_WIND_CHARGE")) {

2
src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java
View file

@ -127,7 +127,7 @@ public final class EntityDeathListener extends Queue implements Listener {
e = isCommand ? "#command" : ""; e = isCommand ? "#command" : "";
} }
if (entity.getType() == EntityType.GLOW_SQUID && damage.getCause() == DamageCause.DROWNING) { if (entity.getType().name().equals("GLOW_SQUID") && damage.getCause() == DamageCause.DROWNING) {
return; return;
} }

5
src/main/java/net/coreprotect/listener/entity/HangingBreakByEntityListener.java
View file

@ -144,8 +144,13 @@ public final class HangingBreakByEntityListener extends Queue implements Listene
material = Material.PAINTING; material = Material.PAINTING;
Painting painting = (Painting) entity; Painting painting = (Painting) entity;
blockData = "FACING=" + painting.getFacing().name(); blockData = "FACING=" + painting.getFacing().name();
try {
itemData = MaterialUtils.getArtId(painting.getArt().toString(), true); itemData = MaterialUtils.getArtId(painting.getArt().toString(), true);
} }
catch (IncompatibleClassChangeError e) {
// 1.21.2+
}
}
if (!event.isCancelled() && Config.getConfig(blockEvent.getWorld()).BLOCK_BREAK && !inspecting) { if (!event.isCancelled() && Config.getConfig(blockEvent.getWorld()).BLOCK_BREAK && !inspecting) {
Queue.queueBlockBreak(culprit, blockEvent, material, blockData, itemData); Queue.queueBlockBreak(culprit, blockEvent, material, blockData, itemData);

5
src/main/java/net/coreprotect/listener/entity/HangingBreakListener.java
View file

@ -72,8 +72,13 @@ public final class HangingBreakListener extends Queue implements Listener {
material = Material.PAINTING; material = Material.PAINTING;
Painting painting = (Painting) entity; Painting painting = (Painting) entity;
blockData = "FACING=" + painting.getFacing().name(); blockData = "FACING=" + painting.getFacing().name();
try {
itemData = MaterialUtils.getArtId(painting.getArt().toString(), true); itemData = MaterialUtils.getArtId(painting.getArt().toString(), true);
} }
catch (IncompatibleClassChangeError e) {
// 1.21.2+
}
}
if (!event.isCancelled() && Config.getConfig(blockEvent.getWorld()).NATURAL_BREAK) { if (!event.isCancelled() && Config.getConfig(blockEvent.getWorld()).NATURAL_BREAK) {
Queue.queueNaturalBlockBreak(causeName, blockEvent.getState(), attachedBlock, material, blockData, itemData); Queue.queueNaturalBlockBreak(causeName, blockEvent.getState(), attachedBlock, material, blockData, itemData);

6
src/main/java/net/coreprotect/listener/entity/HangingPlaceListener.java
View file

@ -40,8 +40,14 @@ public final class HangingPlaceListener extends Queue implements Listener {
material = Material.PAINTING; material = Material.PAINTING;
Painting painting = (Painting) entity; Painting painting = (Painting) entity;
blockData = "FACING=" + painting.getFacing().name(); blockData = "FACING=" + painting.getFacing().name();
try {
artId = MaterialUtils.getArtId(painting.getArt().toString(), true); artId = MaterialUtils.getArtId(painting.getArt().toString(), true);
} }
catch (IncompatibleClassChangeError e) {
artId = 0;
// 1.21.2+
}
}
int inspect = 0; int inspect = 0;
if (ConfigHandler.inspecting.get(player.getName()) != null) { if (ConfigHandler.inspecting.get(player.getName()) != null) {

1
src/main/java/net/coreprotect/utility/entity/HangingUtil.java
View file

@ -16,7 +16,6 @@ import org.bukkit.inventory.ItemStack;
import net.coreprotect.bukkit.BukkitAdapter; import net.coreprotect.bukkit.BukkitAdapter;
import net.coreprotect.model.BlockGroup; import net.coreprotect.model.BlockGroup;
import net.coreprotect.utility.Util;
import net.coreprotect.utility.BlockUtils; import net.coreprotect.utility.BlockUtils;
import net.coreprotect.utility.MaterialUtils; import net.coreprotect.utility.MaterialUtils;