Skip to content

Commit

Permalink
Fix damage crash Fixes #10
Browse files Browse the repository at this point in the history
  • Loading branch information
@TonimatasDEV
TonimatasDEV committed Jan 20, 2024
1 parent 48b7188 commit d1d5c5f
Show file tree
Hide file tree
Showing 2 changed files with 196 additions and 44 deletions.
18 changes: 7 additions & 11 deletions patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@
if (!p_21016_.m_19360_()) {
Entity entity = p_21016_.m_7640_();
if (entity instanceof LivingEntity) {
@@ -1014,30 +_,69 @@
@@ -1014,30 +_,71 @@

flag = true;
}
Expand All @@ -604,7 +604,8 @@
+ }
+ } else {
+ // CraftBukkit start
+ if (!this.damageEntity0(p_21016_, p_21017_ - this.f_20898_))
+ this.m_6475_(p_21016_, p_21017_ - this.f_20898_);
+ if (!damageEntity0)
+ return false;
+ // CraftBukkit end
+ }
Expand All @@ -621,7 +622,8 @@
+ }
+ } else {
+ // CraftBukkit start
+ if (!this.damageEntity0(p_21016_, f))
+ this.m_6475_(p_21016_, f);
+ if (!damageEntity0)
+ return false;
+ // CraftBukkit end
+ }
Expand Down Expand Up @@ -996,11 +998,11 @@
}
}
}
@@ -1513,25 +_,175 @@
@@ -1513,25 +_,169 @@
}
}

+ private boolean damageEntity0;
+ public boolean damageEntity0;
protected void m_6475_(DamageSource p_21240_, float p_21241_) {
if (!this.m_6673_(p_21240_)) {
- p_21241_ = this.m_21161_(p_21240_, p_21241_);
Expand Down Expand Up @@ -1176,12 +1178,6 @@
}
}
+ damageEntity0 = false;
+ }
+
+ // CraftBukkit start
+ protected boolean damageEntity0(final DamageSource p_21240_, float p_21241_) { // void -> boolean, add final
+ m_6475_(p_21240_, p_21241_);
+ return damageEntity0;
}

public CombatTracker m_21231_() {
Expand Down
222 changes: 189 additions & 33 deletions patches/minecraft/net/minecraft/world/entity/player/Player.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
--- a/net/minecraft/world/entity/player/Player.java
+++ b/net/minecraft/world/entity/player/Player.java
@@ -1,5 +_,6 @@
package net.minecraft.world.entity.player;

+import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -70,7 +_,6 @@
import net.minecraft.world.entity.animal.Parrot;
import net.minecraft.world.entity.animal.Pig;
Expand All @@ -22,16 +29,25 @@
import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraft.world.item.trading.MerchantOffers;
@@ -109,9 +_,17 @@
@@ -105,13 +_,26 @@
import net.minecraft.world.level.block.entity.StructureBlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.pattern.BlockInWorld;
+import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.scores.PlayerTeam;
import net.minecraft.world.scores.Scoreboard;
-import net.minecraft.world.scores.Team;
+import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.common.ForgeMod;
+import net.minecraftforge.fml.ModList;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_18_R2.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_18_R2.util.CraftVector;
+import org.bukkit.entity.Item;
+import org.bukkit.event.entity.EntityCombustByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityExhaustionEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerVelocityEvent;
Expand Down Expand Up @@ -336,48 +352,188 @@
});
if (this.f_20935_.m_41619_()) {
if (interactionhand == InteractionHand.MAIN_HAND) {
@@ -876,21 +_,29 @@
}
@@ -877,26 +_,166 @@

protected void m_6475_(DamageSource p_36312_, float p_36313_) {
+ if (true) {
+ this.damageEntity0(p_36312_, p_36313_);
+ return;
+ }
if (!this.m_6673_(p_36312_)) {
+ p_36313_ = net.minecraftforge.common.ForgeHooks.onLivingHurt(this, p_36312_, p_36313_);
+ if (p_36313_ <= 0) return;
p_36313_ = this.m_21161_(p_36312_, p_36313_);
p_36313_ = this.m_6515_(p_36312_, p_36313_);
float f2 = Math.max(p_36313_ - this.m_6103_(), 0.0F);
this.m_7911_(this.m_6103_() - (p_36313_ - f2));
+ f2 = net.minecraftforge.common.ForgeHooks.onLivingDamage(this, p_36312_, f2);
float f = p_36313_ - f2;
if (f > 0.0F && f < 3.4028235E37F) {
this.m_36222_(Stats.f_12933_, Math.round(f * 10.0F));
}

if (f2 != 0.0F) {
+ this.setExhaustionReason(EntityExhaustionEvent.ExhaustionReason.DAMAGED);
this.m_36399_(p_36312_.m_19377_());
- p_36313_ = this.m_21161_(p_36312_, p_36313_);
- p_36313_ = this.m_6515_(p_36312_, p_36313_);
- float f2 = Math.max(p_36313_ - this.m_6103_(), 0.0F);
- this.m_7911_(this.m_6103_() - (p_36313_ - f2));
- float f = p_36313_ - f2;
- if (f > 0.0F && f < 3.4028235E37F) {
- this.m_36222_(Stats.f_12933_, Math.round(f * 10.0F));
- }
-
- if (f2 != 0.0F) {
- this.m_36399_(p_36312_.m_19377_());
+ // Check if entity is a "human" aka player
+ final boolean human = this instanceof Player;
+ final float originalDamage = p_36313_;
+ // Cauldron start - apply forge damage hook
+ p_36313_ = ForgeHooks.onLivingHurt(this, p_36312_, p_36313_);
+ // If the damage is negative return true
+ if (p_36313_ < 0) {
+ damageEntity0 = true;
+ return;
+ }
+ //Magma - Infinity check
+ if (Float.isInfinite(p_36313_))
+ p_36313_ = originalDamage; // Restore original damage to prevent issues with damage calculation
+ // Thermos detect null damage
+ final boolean nulldmg = p_36313_ == 0;
+ // Cauldron end
+
+ Function<Double, Double> hardHat = f -> {
+ if (p_36312_.m_146705_() && !Player.this.m_6844_(EquipmentSlot.HEAD).m_41619_()) {
+ return -(f - (f * 0.75F));
+ }
+ return -0.0;
+ };
+ float hardHatModifier = hardHat.apply((double) p_36313_).floatValue();
+ p_36313_ += hardHatModifier;
+
+ Function<Double, Double> blocking = f -> -((Player.this.m_21275_(p_36312_)) ? f : 0.0);
+ float blockingModifier = blocking.apply((double) p_36313_).floatValue();
+ p_36313_ += blockingModifier;
+
+ Function<Double, Double> armor = f -> -(f - Player.this.m_21161_(p_36312_, f.floatValue()));
+ float armorModifier = armor.apply((double) p_36313_).floatValue();
+ p_36313_ += armorModifier;
+
+ Function<Double, Double> resistance = f -> {
+ if (!p_36312_.m_19379_() && Player.this.m_21023_(MobEffects.f_19606_) && p_36312_ != DamageSource.f_19317_) {
+ int i = (Player.this.m_21124_(MobEffects.f_19606_).m_19564_() + 1) * 5;
+ int j = 25 - i;
+ float f1 = f.floatValue() * (float) j;
+ return -(f - (f1 / 25.0F));
+ }
+ return -0.0;
+ };
+ float resistanceModifier = resistance.apply((double) p_36313_).floatValue();
+ p_36313_ += resistanceModifier;
+
+ Function<Double, Double> magic = f -> -(f - Player.this.m_6515_(p_36312_, f.floatValue()));
+ float magicModifier = magic.apply((double) p_36313_).floatValue();
+ p_36313_ += magicModifier;
+
+ Function<Double, Double> absorption = f -> -(Math.max(f - Math.max(f - Player.this.m_6103_(), 0.0F), 0.0F));
+ float absorptionModifier = absorption.apply((double) p_36313_).floatValue();
+
+ EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, p_36312_, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption);
+ if (p_36312_.m_7639_() instanceof Player) {
+ ((Player) p_36312_.m_7639_()).m_36334_(); // Moved from Player in order to make the cooldown reset get called after the damage event is fired
+ }
+ if (event.isCancelled()) {
+ cancelDamage = true;
+ damageEntity0 = false;
+ return;
+ }
+
+ p_36313_ = (float) event.getFinalDamage();
+
+ if (nulldmg) { // Preclude any stupidity with null head items
+ damageEntity0 = true;
+ return;
+ }
+
+ // Resistance
+ if (event.getDamage(EntityDamageEvent.DamageModifier.RESISTANCE) < 0) {
+ float f3 = (float) -event.getDamage(EntityDamageEvent.DamageModifier.RESISTANCE);
+ if (f3 > 0.0F && f3 < 3.4028235E37F) {
+ if (this instanceof ServerPlayer) {
+ ((ServerPlayer) this).m_36222_(Stats.f_12934_, Math.round(f3 * 10.0F));
+ } else if (p_36312_.m_7639_() instanceof ServerPlayer) {
+ ((ServerPlayer) p_36312_.m_7639_()).m_36222_(Stats.f_12930_, Math.round(f3 * 10.0F));
+ }
+ }
+ }
+
+ // Apply damage to helmet
+ if (p_36312_.m_146705_() && !this.m_6844_(EquipmentSlot.HEAD).m_41619_()) {
+ this.m_142642_(p_36312_, p_36313_);
+ }
+
+ // Apply damage to armor
+ if (!p_36312_.m_19376_() && !ModList.get().isLoaded("the_vault")) { //Magma - skip armor damage if the_vault is loaded
+ float armorDamage = (float) (event.getDamage() + event.getDamage(EntityDamageEvent.DamageModifier.BLOCKING) + event.getDamage(EntityDamageEvent.DamageModifier.HARD_HAT));
+ this.m_6472_(p_36312_, armorDamage);
+ }
+
+ // Apply blocking code // PAIL: steal from above
+ if (event.getDamage(EntityDamageEvent.DamageModifier.BLOCKING) < 0) {
+ this.f_19853_.m_7605_(this, (byte) 29); // SPIGOT-4635 - shield damage sound
+ this.m_7909_((float) -event.getDamage(EntityDamageEvent.DamageModifier.BLOCKING));
+ Entity entity = p_36312_.m_7640_();
+ if (entity instanceof LivingEntity) {
+ this.m_6728_((LivingEntity) entity);
+ }
+ }
+
+ absorptionModifier = (float) -event.getDamage(EntityDamageEvent.DamageModifier.ABSORPTION);
+ this.m_7911_(Math.max(this.m_6103_() - absorptionModifier, 0.0F));
+ float f2 = absorptionModifier;
+
+ if (f2 > 0.0F && f2 < 3.4028235E37F && this instanceof Player) {
+ ((Player) this).m_36222_(Stats.f_12933_, Math.round(f2 * 10.0F));
+ }
+ if (f2 > 0.0F && f2 < 3.4028235E37F && p_36312_.m_7639_() instanceof ServerPlayer) {
+ ((ServerPlayer) p_36312_.m_7639_()).m_36222_(Stats.f_12929_, Math.round(f2 * 10.0F));
+ }
+
+ p_36313_ = net.minecraftforge.common.ForgeHooks.onLivingDamage(this, p_36312_, p_36313_);
+
+ if (p_36313_ > 0 || !human) {
+ if (human) {
+ // PAIL: Be sure to drag all this code from the Player subclass each update.
+ ((Player) this).setExhaustionReason(org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.DAMAGED);
+ ((Player) this).m_36399_(p_36312_.m_19377_());
+ if (p_36313_ < 3.4028235E37F) {
+ ((Player) this).m_36222_(Stats.f_12931_, Math.round(p_36313_ * 10.0F));
+ }
+ }
+ // CraftBukkit end
float f1 = this.m_21223_();
- this.m_21153_(this.m_21223_() - f2);
this.m_21231_().m_19289_(p_36312_, f1, f2);
+ this.m_21153_(f1 - f2); // Forge: moved to fix MC-121048
if (f2 < 3.4028235E37F) {
this.m_36222_(Stats.f_12931_, Math.round(f2 * 10.0F));
- this.m_21231_().m_19289_(p_36312_, f1, f2);
- if (f2 < 3.4028235E37F) {
- this.m_36222_(Stats.f_12931_, Math.round(f2 * 10.0F));
+ this.m_21231_().m_19289_(p_36312_, f1, p_36313_);
+ this.m_21153_(f1 - p_36313_); // Forge: moved to fix MC-121048
+ // CraftBukkit start
+ if (!human) {
+ this.m_7911_(this.m_6103_() - p_36313_);
}
@@ -899,6 +_,10 @@
+ this.m_146852_(GameEvent.f_157808_, p_36312_.m_7639_());

+ damageEntity0 = true;
+ return;
+ } else {
+ // Duplicate triggers if blocking
+ if (event.getDamage(EntityDamageEvent.DamageModifier.BLOCKING) < 0) {
+ if (this instanceof ServerPlayer) {
+ CriteriaTriggers.f_10574_.m_35174_((ServerPlayer) this, p_36312_, p_36313_, originalDamage, true);
+ f2 = (float) -event.getDamage(EntityDamageEvent.DamageModifier.BLOCKING);
+ if (f2 > 0.0F && f2 < 3.4028235E37F) {
+ ((ServerPlayer) this).m_36222_(Stats.f_12932_, Math.round(originalDamage * 10.0F));
+ }
+ }
+ if (p_36312_.m_7639_() instanceof ServerPlayer) {
+ CriteriaTriggers.f_10573_.m_60112_((ServerPlayer) p_36312_.m_7639_(), this, p_36312_, p_36313_, originalDamage, true);
+ }
+ damageEntity0 = false;
+ return;
+ } else {
+ damageEntity0 = originalDamage > 0;
+ return;
+ }
+ // CraftBukkit end
}
}
+ damageEntity0 = false;
}

+ protected boolean damageEntity0(DamageSource p_36312_, float p_36313_) {
+ return super.damageEntity0(p_36312_, p_36313_);
+ }
+
protected boolean m_6046_() {
return !this.f_36077_.f_35935_ && super.m_6046_();
}
@@ -939,6 +_,8 @@

return InteractionResult.PASS;
Expand Down

0 comments on commit d1d5c5f

Please sign in to comment.