aboutsummaryrefslogtreecommitdiffhomepage
path: root/patch-remap/mache-vineflower/net/minecraft/world/damagesource/DamageSources.java.patch
diff options
context:
space:
mode:
authorMiniDigger | Martin <[email protected]>2024-01-14 11:04:49 +0100
committerMiniDigger | Martin <[email protected]>2024-01-14 11:04:49 +0100
commitbee74680e607c2e29b038329f62181238911cd83 (patch)
tree708fd1a4a0227d9071243adf2a42d5e9e96cde4a /patch-remap/mache-vineflower/net/minecraft/world/damagesource/DamageSources.java.patch
parent0a44692ef6ff6e255d48eb3ba1bb114166eafda9 (diff)
downloadPaper-softspoon.tar.gz
Paper-softspoon.zip
add remapped patches as a testsoftspoon
Diffstat (limited to 'patch-remap/mache-vineflower/net/minecraft/world/damagesource/DamageSources.java.patch')
-rw-r--r--patch-remap/mache-vineflower/net/minecraft/world/damagesource/DamageSources.java.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/patch-remap/mache-vineflower/net/minecraft/world/damagesource/DamageSources.java.patch b/patch-remap/mache-vineflower/net/minecraft/world/damagesource/DamageSources.java.patch
new file mode 100644
index 0000000000..bfcf24b00e
--- /dev/null
+++ b/patch-remap/mache-vineflower/net/minecraft/world/damagesource/DamageSources.java.patch
@@ -0,0 +1,35 @@
+--- a/net/minecraft/world/damagesource/DamageSources.java
++++ b/net/minecraft/world/damagesource/DamageSources.java
+@@ -16,6 +16,7 @@
+ import net.minecraft.world.phys.Vec3;
+
+ public class DamageSources {
++
+ private final Registry<DamageType> damageTypes;
+ private final DamageSource inFire;
+ private final DamageSource lightningBolt;
+@@ -40,9 +41,15 @@
+ private final DamageSource stalagmite;
+ private final DamageSource outsideBorder;
+ private final DamageSource genericKill;
++ // CraftBukkit start
++ public final DamageSource melting;
++ public final DamageSource poison;
+
+ public DamageSources(RegistryAccess registry) {
+ this.damageTypes = registry.registryOrThrow(Registries.DAMAGE_TYPE);
++ this.melting = this.source(DamageTypes.ON_FIRE).melting();
++ this.poison = this.source(DamageTypes.MAGIC).poison();
++ // CraftBukkit end
+ this.inFire = this.source(DamageTypes.IN_FIRE);
+ this.lightningBolt = this.source(DamageTypes.LIGHTNING_BOLT);
+ this.onFire = this.source(DamageTypes.ON_FIRE);
+@@ -229,7 +236,7 @@
+ }
+
+ public DamageSource explosion(@Nullable Explosion explosion) {
+- return explosion != null ? this.explosion(explosion.getDirectSourceEntity(), explosion.getIndirectSourceEntity()) : this.explosion(null, null);
++ return explosion != null ? this.explosion(explosion.getDirectSourceEntity(), explosion.getIndirectSourceEntity()) : this.explosion((Entity) null, (Entity) null);
+ }
+
+ public DamageSource explosion(@Nullable Entity causingEntity, @Nullable Entity directEntity) {