Skip to content

fix: prevent wind charges and mace explosions from breaking blocks from version 1.20.3 onwards #631

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 1 commit into
base: master
Choose a base branch
from
Open

fix: prevent wind charges and mace explosions from breaking blocks from version 1.20.3 onwards #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions React/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {


version '1.0.3' // Needs to be version specific
def apiVersion = '1.19'
def apiVersion = '1.20'
def name = getRootProject().getName() // Defined in settings.gradle
def main = 'com.volmit.react.React'

Expand All @@ -36,6 +36,7 @@ registerCustomOutputTask('Vatuu', 'D://Minecraft/Servers/1.19/plugins')
registerCustomOutputTask('Nowhere', 'E://Desktop/server/plugins')
registerCustomOutputTask('Pixel', 'C://Users//repix//Iris Dimension Engine//1.20.4 - Development/plugins')
registerCustomOutputTask('CrazyDev22', 'C:\\Users\\Julian\\Desktop\\server\\plugins')
registerCustomOutputTask('NeroBuddy1313', 'E:\\Data\\Server\\1.21.8\\plugins')
// ========================== UNIX ==============================
registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins')
registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Desktop/REMOTES/RemoteMinecraft/plugins')
Expand Down Expand Up @@ -83,7 +84,10 @@ shadowJar {
minimize()
append("plugin.yml")
dependencies {
include(dependency('com.github.VolmitDev:'))
include(dependency('com.github.VolmitDev:Curse:.*'))
include(dependency('com.github.VolmitDev:MultiBurst:.*'))
include(dependency('com.github.VolmitDev:Chrono:.*'))
include(dependency('com.github.VolmitDev:Spatial:.*'))
}

archiveClassifier = null
Expand All @@ -100,7 +104,7 @@ dependencies {
// Provided or Classpath
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'
compileOnly 'org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT'
compileOnly 'org.spigotmc:spigot-api:1.20.3-R0.1-SNAPSHOT'
compileOnly "io.papermc:paperlib:1.0.7"

// Shaded
Expand Down
9 changes: 9 additions & 0 deletions React/src/main/java/com/volmit/react/content/feature/FeatureFastExplosions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.bukkit.block.Block;
import org.bukkit.block.Container;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.entity.WindCharge;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
Expand Down Expand Up @@ -77,6 +78,10 @@ public void on(EntitySpawnEvent e) {

@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void on(BlockExplodeEvent e) {
if (e.getBlock().getType() == Material.AIR) {
return;
}

var b = new ArrayList<>(e.blockList());

if (disableEntityChainReactions) {
Expand Down Expand Up @@ -129,6 +134,10 @@ public void on(BlockExplodeEvent e) {

@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void on(EntityExplodeEvent e) {
if(e.getEntity() instanceof WindCharge){
return;
}

var b = new ArrayList<>(e.blockList());

if (disableEntityChainReactions) {
Expand Down
4 changes: 2 additions & 2 deletions React/src/main/java/com/volmit/react/util/data/B.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private static IntSet buildFoliageCache() {
WHITE_TULIP,
FERN,
LARGE_FERN,
GRASS,
SHORT_GRASS,
TALL_GRASS
}).forEach((i) -> b.add(i.ordinal()));

Expand Down Expand Up @@ -140,7 +140,7 @@ private static Int2IntMap buildDeepslate2NormalCache() {
private static IntSet buildDecorantCache() {
IntSet b = new IntOpenHashSet();
Arrays.stream(new Material[]{
GRASS,
SHORT_GRASS,
TALL_GRASS,
FERN,
LARGE_FERN,
Expand Down