aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/unapplied/server/0582-Add-critical-damage-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/unapplied/server/0582-Add-critical-damage-API.patch')
-rw-r--r--patches/unapplied/server/0582-Add-critical-damage-API.patch101
1 files changed, 101 insertions, 0 deletions
diff --git a/patches/unapplied/server/0582-Add-critical-damage-API.patch b/patches/unapplied/server/0582-Add-critical-damage-API.patch
new file mode 100644
index 0000000000..78d51e8e03
--- /dev/null
+++ b/patches/unapplied/server/0582-Add-critical-damage-API.patch
@@ -0,0 +1,101 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: dodison <[email protected]>
+Date: Mon, 26 Jul 2021 17:32:36 +0200
+Subject: [PATCH] Add critical damage API
+
+
+diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+index c1d121d83591ca1b5bf9d9406c9622b4f24eafef..aee26dd78953ff43306aaa64161f5b9edcdd4b83 100644
+--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
++++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+@@ -276,4 +276,18 @@ public class DamageSource {
+ public Holder<DamageType> typeHolder() {
+ return this.type;
+ }
++
++ // Paper start - add critical damage API
++ private boolean critical;
++ public boolean isCritical() {
++ return this.critical;
++ }
++ public DamageSource critical() {
++ return this.critical(true);
++ }
++ public DamageSource critical(boolean critical) {
++ this.critical = critical;
++ return this;
++ }
++ // Paper end - add critical damage API
+ }
+diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+index 57850f16a681af4fc302895c7608247675b44ab4..68a6b1508ce4544fe8b18746d440944d41a2fe5b 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -1258,6 +1258,7 @@ public abstract class Player extends LivingEntity {
+
+ flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits
+ if (flag2) {
++ damagesource = damagesource.critical(true); // Paper start - critical damage API
+ f *= 1.5F;
+ }
+
+@@ -1317,7 +1318,7 @@ public abstract class Player extends LivingEntity {
+ float f7 = this.getEnchantedDamage(entityliving2, f6, damagesource) * f2;
+
+ // CraftBukkit start - Only apply knockback if the damage hits
+- if (!entityliving2.hurtServer((ServerLevel) this.level(), this.damageSources().playerAttack(this).sweep(), f7)) {
++ if (!entityliving2.hurtServer((ServerLevel) this.level(), this.damageSources().playerAttack(this).sweep().critical(flag2), f7)) { // Paper - add critical damage API
+ continue;
+ }
+ // CraftBukkit end
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+index 220c687a9543b84d994c4f238757737c9337227a..07f36edf9362227521daabfdceaa7e136d854f8d 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+@@ -450,6 +450,7 @@ public abstract class AbstractArrow extends Projectile {
+ entityliving.setLastHurtMob(entity);
+ }
+
++ if (this.isCritArrow()) damagesource = damagesource.critical(); // Paper - add critical damage API
+ boolean flag = entity.getType() == EntityType.ENDERMAN;
+ int k = entity.getRemainingFireTicks();
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index 24f86724012bb8bcd6d24683a1c78ce66b42ca30..a5285a8952b2d99bfbb928b1bb31d3ddcf8ed57b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1078,7 +1078,7 @@ public class CraftEventFactory {
+ return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), source.getDirectBlockState(), entity, DamageCause.BLOCK_EXPLOSION, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
+ }
+ DamageCause damageCause = (damager.getBukkitEntity() instanceof org.bukkit.entity.TNTPrimed) ? DamageCause.BLOCK_EXPLOSION : DamageCause.ENTITY_EXPLOSION;
+- return CraftEventFactory.callEntityDamageEvent(damager, entity, damageCause, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
++ return CraftEventFactory.callEntityDamageEvent(damager, entity, damageCause, bukkitDamageSource, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
+ } else if (damager != null || source.getDirectEntity() != null) {
+ DamageCause cause = (source.isSweep()) ? DamageCause.ENTITY_SWEEP_ATTACK : DamageCause.ENTITY_ATTACK;
+
+@@ -1104,7 +1104,7 @@ public class CraftEventFactory {
+ cause = DamageCause.MAGIC;
+ }
+
+- return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
++ return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
+ } else if (source.is(DamageTypes.FELL_OUT_OF_WORLD)) {
+ return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), source.getDirectBlockState(), entity, DamageCause.VOID, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
+ } else if (source.is(DamageTypes.LAVA)) {
+@@ -1164,13 +1164,13 @@ public class CraftEventFactory {
+ cause = DamageCause.CUSTOM;
+ }
+
+- return CraftEventFactory.callEntityDamageEvent((Entity) null, entity, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
++ return CraftEventFactory.callEntityDamageEvent((Entity) null, entity, cause, bukkitDamageSource, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
+ }
+
+- private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, org.bukkit.damage.DamageSource bukkitDamageSource, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
++ private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, org.bukkit.damage.DamageSource bukkitDamageSource, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled, boolean critical) { // Paper - add critical damage API
+ EntityDamageEvent event;
+ if (damager != null) {
+- event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions);
++ event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, critical);
+ } else {
+ event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions);
+ }