2021-10-21 00:15:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: dodison <kacpik@mapik.eu>
|
|
|
|
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
|
2021-10-31 08:34:10 +01:00
|
|
|
index 80d19af2ad423bd3de0e039c5bb8f97af536aaa9..a828cad27fcd39f8bfbaefa97052a2a3b6650ee7 100644
|
2021-10-21 00:15:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
|
|
|
|
@@ -64,6 +64,19 @@ public class DamageSource {
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
// CraftBukkit end
|
|
|
|
+ // Paper start - add critical damage API
|
|
|
|
+ private boolean critical;
|
2021-10-21 16:11:19 +02:00
|
|
|
+ public boolean isCritical() {
|
2021-10-21 00:15:28 +02:00
|
|
|
+ return this.critical;
|
|
|
|
+ }
|
|
|
|
+ public DamageSource critical() {
|
|
|
|
+ return this.critical(true);
|
|
|
|
+ }
|
|
|
|
+ public DamageSource critical(boolean critical) {
|
|
|
|
+ this.critical = critical;
|
|
|
|
+ return this;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
public static DamageSource sting(LivingEntity attacker) {
|
|
|
|
return new EntityDamageSource("sting", attacker);
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2021-11-25 02:24:51 +01:00
|
|
|
index 3f9e3415db6cfee317da695793d295660ef29b18..beebd31d7a82a4edae0e2e7c5890cd13fbb6c4df 100644
|
2021-10-21 00:15:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2021-11-25 02:24:51 +01:00
|
|
|
@@ -2570,15 +2570,27 @@ public abstract class LivingEntity extends Entity {
|
2021-10-21 00:15:28 +02:00
|
|
|
return this.hasEffect(MobEffects.JUMP) ? (double) (0.1F * (float) (this.getEffect(MobEffects.JUMP).getAmplifier() + 1)) : 0.0D;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ protected long lastJumpTime = 0L; // Paper - add critical damage API
|
|
|
|
protected void jumpFromGround() {
|
|
|
|
double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
|
|
|
|
Vec3 vec3d = this.getDeltaMovement();
|
|
|
|
+ // Paper start - add critical damage API
|
|
|
|
+ long time = System.nanoTime();
|
|
|
|
+ boolean canCrit = true;
|
|
|
|
+ if (this instanceof net.minecraft.world.entity.player.Player) {
|
|
|
|
+ canCrit = false;
|
|
|
|
+ if (time - this.lastJumpTime > (long)(0.250e9)) {
|
|
|
|
+ this.lastJumpTime = time;
|
|
|
|
+ canCrit = true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end - add critical damage API
|
|
|
|
|
|
|
|
this.setDeltaMovement(vec3d.x, d0, vec3d.z);
|
|
|
|
if (this.isSprinting()) {
|
|
|
|
float f = this.getYRot() * 0.017453292F;
|
|
|
|
|
|
|
|
- this.setDeltaMovement(this.getDeltaMovement().add((double) (-Mth.sin(f) * 0.2F), 0.0D, (double) (Mth.cos(f) * 0.2F)));
|
|
|
|
+ if (canCrit) this.setDeltaMovement(this.getDeltaMovement().add((double) (-Mth.sin(f) * 0.2F), 0.0D, (double) (Mth.cos(f) * 0.2F))); // Paper - add critical damage API
|
|
|
|
}
|
|
|
|
|
|
|
|
this.hasImpulse = true;
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
2021-11-25 02:24:51 +01:00
|
|
|
index 44c2820a33ed40b4ef2ebd20708347d3cc2437ae..b6f8e94df86c174569ccbc69cfd031cc08271dd3 100644
|
2021-10-21 00:15:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
2021-11-25 02:24:51 +01:00
|
|
|
@@ -1215,7 +1215,7 @@ public abstract class Player extends LivingEntity {
|
2021-10-21 00:15:28 +02:00
|
|
|
flag1 = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
- boolean flag2 = flag && this.fallDistance > 0.0F && !this.onGround && !this.onClimbable() && !this.isInWater() && !this.hasEffect(MobEffects.BLINDNESS) && !this.isPassenger() && target instanceof LivingEntity;
|
|
|
|
+ boolean flag2 = flag && this.fallDistance > 0.0F && !this.onGround && !this.onClimbable() && !this.isInWater() && !this.hasEffect(MobEffects.BLINDNESS) && !this.isPassenger() && target instanceof LivingEntity; // Paper - Add critical damage API - conflict on change
|
|
|
|
|
|
|
|
flag2 = flag2 && !level.paperConfig.disablePlayerCrits; // Paper
|
|
|
|
flag2 = flag2 && !this.isSprinting();
|
2021-11-25 02:24:51 +01:00
|
|
|
@@ -1255,7 +1255,7 @@ public abstract class Player extends LivingEntity {
|
2021-10-21 00:15:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Vec3 vec3d = target.getDeltaMovement();
|
|
|
|
- boolean flag5 = target.hurt(DamageSource.playerAttack(this), f);
|
|
|
|
+ boolean flag5 = target.hurt(DamageSource.playerAttack(this).critical(flag2), f); // Paper - add critical damage API
|
|
|
|
|
|
|
|
if (flag5) {
|
|
|
|
if (i > 0) {
|
2021-11-25 02:24:51 +01:00
|
|
|
@@ -1283,7 +1283,7 @@ public abstract class Player extends LivingEntity {
|
2021-10-21 00:15:28 +02:00
|
|
|
|
2021-11-25 02:24:51 +01:00
|
|
|
if (entityliving != this && entityliving != target && !this.isAlliedTo((Entity) entityliving) && (!(entityliving instanceof ArmorStand) || !((ArmorStand) entityliving).isMarker()) && this.distanceToSqr((Entity) entityliving) < 9.0D) {
|
2021-10-21 00:15:28 +02:00
|
|
|
// CraftBukkit start - Only apply knockback if the damage hits
|
|
|
|
- if (entityliving.hurt(DamageSource.playerAttack(this).sweep(), f4)) {
|
|
|
|
+ if (entityliving.hurt(DamageSource.playerAttack(this).sweep().critical(flag2), f4)) { // Paper - add critical damage API
|
|
|
|
entityliving.knockback(0.4000000059604645D, (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper
|
|
|
|
}
|
|
|
|
// 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
|
2021-11-25 02:24:51 +01:00
|
|
|
index b436103957113bff5e553dacb869c775a3f8b059..3d3dcb47720055f550d17d1f106a2c0e59de2919 100644
|
2021-10-21 00:15:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
|
|
|
|
@@ -381,6 +381,7 @@ public abstract class AbstractArrow extends Projectile {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ 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
|
2021-11-25 02:24:51 +01:00
|
|
|
index 5013a93f9bdc6d2c52239ca0434c7aa40f0572e1..aaf47d3f58819ead3553973c159c5c6eec4abe43 100644
|
2021-10-21 00:15:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
|
|
@@ -964,7 +964,7 @@ public class CraftEventFactory {
|
|
|
|
} else {
|
|
|
|
damageCause = DamageCause.ENTITY_EXPLOSION;
|
|
|
|
}
|
|
|
|
- event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions);
|
2021-10-21 16:11:19 +02:00
|
|
|
+ event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions, source.isCritical()); // Paper - add critical damage API
|
2021-10-21 00:15:28 +02:00
|
|
|
}
|
|
|
|
event.setCancelled(cancelled);
|
|
|
|
|
|
|
|
@@ -989,7 +989,7 @@ public class CraftEventFactory {
|
|
|
|
cause = DamageCause.THORNS;
|
|
|
|
}
|
|
|
|
|
|
|
|
- return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled);
|
2021-10-21 16:11:19 +02:00
|
|
|
+ return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
|
2021-10-21 00:15:28 +02:00
|
|
|
} else if (source == DamageSource.OUT_OF_WORLD) {
|
|
|
|
EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, modifiers, modifierFunctions);
|
|
|
|
event.setCancelled(cancelled);
|
|
|
|
@@ -1044,7 +1044,7 @@ public class CraftEventFactory {
|
|
|
|
} else {
|
|
|
|
throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.msgId));
|
|
|
|
}
|
|
|
|
- EntityDamageEvent event = new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions);
|
2021-10-21 16:11:19 +02:00
|
|
|
+ EntityDamageEvent event = new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions, source.isCritical()); // Paper - add critical damage API
|
2021-10-21 00:15:28 +02:00
|
|
|
event.setCancelled(cancelled);
|
|
|
|
CraftEventFactory.callEvent(event);
|
|
|
|
if (!event.isCancelled()) {
|
|
|
|
@@ -1087,20 +1087,28 @@ public class CraftEventFactory {
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cause != null) {
|
|
|
|
- return CraftEventFactory.callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions, cancelled);
|
2021-10-21 16:11:19 +02:00
|
|
|
+ return CraftEventFactory.callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
|
2021-10-21 00:15:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
throw new IllegalStateException(String.format("Unhandled damage of %s from %s", entity, source.msgId));
|
|
|
|
}
|
|
|
|
|
|
|
|
+ @Deprecated // Paper - Add critical damage API
|
|
|
|
private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions) {
|
|
|
|
return CraftEventFactory.callEntityDamageEvent(damager, damagee, cause, modifiers, modifierFunctions, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - Add critical damage API
|
|
|
|
+ @Deprecated
|
|
|
|
private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
|
|
|
|
+ return CraftEventFactory.callEntityDamageEvent(damager, damagee, cause, modifiers, modifierFunctions, false, false);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled, boolean critical) {
|
|
|
|
+ // Paper end
|
|
|
|
EntityDamageEvent event;
|
|
|
|
if (damager != null) {
|
|
|
|
- event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
|
|
|
|
+ event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions, critical); // Paper - add critical damage API
|
|
|
|
} else {
|
|
|
|
event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
|
|
|
|
}
|