Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-30 12:19:08 +00:00
Code Issues Releases Activity

Check if exploding entity is primed tnt

Browse Source
This commit is contained in:
Samsuik
2024-03-09 00:15:25 +00:00
parent 44f18e82cb
commit 4f7b6d9564
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0020-Optimised-Explosions.patch
View File

@@ -1011,7 +1011,7 @@ index f529f5d0f28533ec89f3ee712e59745991d068ee..d0ff7710577c1cfedae494796e6db420
public float getEntityDamageAmount(Explosion explosion, Entity entity, double seenPercent) {
// Paper end - actually optimise explosions
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index c23ae4d49c59cdd49495f6e8ffb7c7d21b016b42..d7bafa6d84f2cf21af5af90260bae1a43221fb2f 100644
index c23ae4d49c59cdd49495f6e8ffb7c7d21b016b42..46271bda79558ee965b3d2bd893a68feee8e898c 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -230,6 +230,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1030,7 +1030,7 @@ index c23ae4d49c59cdd49495f6e8ffb7c7d21b016b42..d7bafa6d84f2cf21af5af90260bae1a4
+ // Sakura start
+ Explosion explosion;
+
+ if (explosionSourceType == ExplosionInteraction.TNT) {
+ if (entity instanceof net.minecraft.world.entity.item.PrimedTnt) {
+ explosion = new me.samsuik.sakura.explosion.SakuraExplosion(this, entity, damageSource, behavior, x, y, z, power, createFire, explosion_effect1, particle, emitterParticle, soundEvent);
+ } else {
+ explosion = new Explosion(this, entity, damageSource, behavior, x, y, z, power, createFire, explosion_effect1, particle, emitterParticle, soundEvent);