@@ -612,14 +612,13 @@ index 4bc68b3145f42f5a432e1e897b3f41606735afd1..dc02ae364afe4b1226d224d54e563cef
612
612
this.isIteratingOverLevels = false; // Paper
613
613
614
614
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
615
- index 04afadf047b84492dddd5ecc39e116ca74189545..fdc2a130c22bb63fc2a84b4f1be0889f78fd40d4 100644
615
+ index 04afadf047b84492dddd5ecc39e116ca74189545..a806fd9132628c4f949f64dd80208ab40329ece6 100644
616
616
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
617
617
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
618
- @@ -1935,7 +1935,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
619
- if (!explosion.interactsWithBlocks()) {
618
+ @@ -1936,6 +1936,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
620
619
explosion.clearToBlow();
621
620
}
622
- -
621
+
623
622
+ // Sakura start
624
623
+ notifyPlayersOfExplosion(x, y, z, power, explosion);
625
624
+ return explosion;
@@ -629,7 +628,7 @@ index 04afadf047b84492dddd5ecc39e116ca74189545..fdc2a130c22bb63fc2a84b4f1be0889f
629
628
Iterator iterator = this.players.iterator();
630
629
631
630
while (iterator.hasNext()) {
632
- @@ -1946,7 +1951 ,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
631
+ @@ -1946,7 +1952 ,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
633
632
}
634
633
}
635
634
@@ -659,7 +658,7 @@ index 02ef6ca32f3de52e921fdcf3f0f572ce7afef318..919680a42a8362859cd87fb3d87e8ee8
659
658
660
659
@Override
661
660
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
662
- index 1b335111bd9eb90bbda87225b740768705f26193..545b8dc248d3d57396f548e57898e009876cc150 100644
661
+ index 1b335111bd9eb90bbda87225b740768705f26193..68c8e3d58478f52a05ed71236986103533459604 100644
663
662
--- a/src/main/java/net/minecraft/world/level/Explosion.java
664
663
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
665
664
@@ -56,12 +56,14 @@ public class Explosion {
@@ -721,15 +720,6 @@ index 1b335111bd9eb90bbda87225b740768705f26193..545b8dc248d3d57396f548e57898e009
721
720
final long key, final boolean calculateResistance) {
722
721
ExplosionBlockCache ret = this.blockCache.get(key);
723
722
if (ret != null) {
724
- @@ -281,7 +289,7 @@ public class Explosion {
725
- }
726
- }
727
-
728
- - if (!collision.isEmpty() && collision.clipDirect(from, to, currPos)) { // Sakura
729
- + if (!collision.isEmpty() && collision.clip(from, to, currPos) != null) { // Sakura
730
- return true;
731
- }
732
- }
733
723
@@ -313,7 +321,8 @@ public class Explosion {
734
724
}
735
725
}
0 commit comments