Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2026-01-06 15:41:49 +00:00
Code Issues Releases Activity

Finish 1.20.3 and 1.20.4 updating

Browse Source
This commit is contained in:
Samsuik
2023-12-08 17:47:00 +00:00
parent b2a8bbaa9b
commit 6be4457d3f
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -968,6 +968,19 @@ index 9fdfc43ea51a326444a04d79976d315aa64050d1..4d052ef2b6d3ebd399e1904d67e97396
}
return blockDensity;
diff --git a/src/main/java/net/minecraft/world/level/ExplosionDamageCalculator.java b/src/main/java/net/minecraft/world/level/ExplosionDamageCalculator.java
index 67625a34084792f6cbab34bf99e5571bb75e59d9..806c0213791ba94a6da121b83921064b0480643b 100644
--- a/src/main/java/net/minecraft/world/level/ExplosionDamageCalculator.java
+++ b/src/main/java/net/minecraft/world/level/ExplosionDamageCalculator.java
@@ -22,7 +22,7 @@ public class ExplosionDamageCalculator {
public float getEntityDamageAmount(Explosion explosion, Entity entity) {
// Paper start - actually optimise explosions
- return this.getEntityDamageAmount(explosion, entity, Explosion.getSeenPercent(explosion.center(), entity));
+ return this.getEntityDamageAmount(explosion, entity, Explosion.getSeenPercent(explosion.center(), entity, null)); // Sakura
}
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 37fbba2f6eb32f2806ae1fec90d7be800ba91d49..c63c5c1451d5678ddea0d570ff2628af258490ae 100644
--- a/src/main/java/net/minecraft/world/level/Level.java

6
patches/server/0034-Added-list-of-ItemEntity-s-that-ignore-explosions.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Added list of ItemEntity's that ignore explosions
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
index a39db702063887cf530f272deaf4f334047cc7d4..bb7a14aa86dfb376a5a83f14cfbd8495eb92cbb4 100644
index a39db702063887cf530f272deaf4f334047cc7d4..1a29d35db958c60e014198536d65c4f903863049 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -578,6 +578,17 @@ public class ItemEntity extends Entity implements TraceableEntity {
@@ -14,11 +14,11 @@ index a39db702063887cf530f272deaf4f334047cc7d4..bb7a14aa86dfb376a5a83f14cfbd8495
+ // Sakura start
+ @Override
+ public boolean ignoreExplosion() {
+ public boolean ignoreExplosion(net.minecraft.world.level.Explosion explosion) {
+ if (this.level().sakuraConfig().entity.items.explosionResistantItems.contains(this.getItem().getItem())) {
+ return true;
+ } else {
+ return super.ignoreExplosion();
+ return super.ignoreExplosion(explosion);
+ }
+ }
+ // Sakura end