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

Fix infinite loop in search for blocks when using legacy physics

Browse Source
This commit is contained in:
Samsuik
2025-01-16 11:29:47 +00:00
parent 92bcc1b648
commit 1fa1f6f2eb
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/server/0038-Configure-cannon-physics-by-version.patch
View File

@@ -475,7 +475,7 @@ index 4d0cfa1f96a04713cb1d51c7aaaf91374a0d6c17..96c43df6834e20a9e04eb095f36a644e
// Paper end - Option to prevent TNT from moving in water
}
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index bf39d7aa21c3f0dc9cf1b31224cce3a114e8ea86..016ab8ff4be6a8f7e96bce34452180cefa43c44a 100644
index 6852abf596187b328a1e67bd915c5870a1a60688..d0ba33c84cb2c1d01a368f5ec8a047da5cf81863 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -78,6 +78,7 @@ public class Explosion {
@@ -508,7 +508,7 @@ index bf39d7aa21c3f0dc9cf1b31224cce3a114e8ea86..016ab8ff4be6a8f7e96bce34452180ce
}
if (hitResult == HitResult.Type.MISS) {
// Sakura end - replace density cache
@@ -581,6 +587,14 @@ public class Explosion {
@@ -581,6 +587,15 @@ public class Explosion {
}
if (cachedBlock.outOfWorld) {
@@ -517,13 +517,14 @@ index bf39d7aa21c3f0dc9cf1b31224cce3a114e8ea86..016ab8ff4be6a8f7e96bce34452180ce
+ currX += incX;
+ currY += incY;
+ currZ += incZ;
+ power -= 0.22500001F;
+ continue;
+ }
+ // Sakura end - physics version api
break;
}
// Paper end - collision optimisations
@@ -683,9 +697,15 @@ public class Explosion {
@@ -683,9 +698,15 @@ public class Explosion {
if (d7 <= 1.0D) {
double d8 = entity.getX() - this.x;
@@ -540,7 +541,7 @@ index bf39d7aa21c3f0dc9cf1b31224cce3a114e8ea86..016ab8ff4be6a8f7e96bce34452180ce
if (d11 != 0.0D) {
d8 /= d11;
@@ -1018,7 +1038,7 @@ public class Explosion {
@@ -1018,7 +1039,7 @@ public class Explosion {
// Sakura start - replace density cache
float blockDensity = this.level.densityCache.getDensity(vec3d, entity);
if (blockDensity == me.samsuik.sakura.explosion.density.BlockDensityCache.UNKNOWN_DENSITY) {
@@ -549,7 +550,7 @@ index bf39d7aa21c3f0dc9cf1b31224cce3a114e8ea86..016ab8ff4be6a8f7e96bce34452180ce
this.level.densityCache.putDensity(vec3d, entity, blockDensity);
// Sakura end - replace density cache
}
@@ -1026,6 +1046,17 @@ public class Explosion {
@@ -1026,6 +1047,17 @@ public class Explosion {
return blockDensity;
}

4
patches/server/0054-Add-explosions-dropping-items-config.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add explosions dropping items config
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index 7ee530df4c57e400766056e664622e2847f3fe5a..c3987012b1686354c68ef3e49d465a97e121db1e 100644
index 958cb715479d527a0833d1abee0852b2cc65b0ff..9dc47e2a61196cff74726972afe392ac1983ec84 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -912,6 +912,11 @@ public class Explosion {
@@ -913,6 +913,11 @@ public class Explosion {
this.level.densityCache.invalidate();
}
// Sakura end - explosion density cache

4
patches/server/0075-Set-entity-impulse-on-explosion.patch
View File

@@ -17,10 +17,10 @@ index 289e935a2e6dfa5d45b9c913b8ed320e1a170f93..5920491a3857f3e75d02a33a1c3eae89
}
}
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index f248d8a3e63bb6f33001518e3481c7e7c75cac1b..10260736ac47e15cb55f43c4dd720cbbe7fe4e15 100644
index 8091187e9d09b16e466f09935861a32309f399b5..2679c5062a6385466dc707582ada71b361ec7106 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -786,6 +786,7 @@ public class Explosion {
@@ -787,6 +787,7 @@ public class Explosion {
// Paper end - knockback events
}
// CraftBukkit end