SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

#1399: Fix regression preventing positive .setDamage value from causing knockback for 0 damage events

Quellcode durchsuchen 
By: LoliColleen <76620594+LoliColleen@users.noreply.github.com>
Dieser Commit ist enthalten in:
CraftBukkit/Spigot 2024-05-14 21:32:40 +10:00
Ursprung 575f106abd
Commit 04a297608d
1 geänderte Dateien mit 33 neuen und 39 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

72
paper-server/nms-patches/net/minecraft/world/entity/EntityLiving.patch
Datei anzeigen

@ -428,7 +428,7 @@
this.hurtHelmet(damagesource, f); this.hurtHelmet(damagesource, f);
f *= 0.75F; f *= 0.75F;
} }
@@ -1212,18 +1430,33 @@ @@ -1212,18 +1430,27 @@
this.walkAnimation.setSpeed(1.5F); this.walkAnimation.setSpeed(1.5F);
boolean flag1 = true; boolean flag1 = true;
@ -443,9 +443,6 @@
+ if (!this.actuallyHurt(damagesource, f - this.lastHurt)) { + if (!this.actuallyHurt(damagesource, f - this.lastHurt)) {
+ return false; + return false;
+ } + }
+ if (this instanceof EntityPlayer && f == 0) { // CraftBukkit - Player entities can't be hurt by 0 damage
+ return false;
+ }
+ // CraftBukkit end + // CraftBukkit end
this.lastHurt = f; this.lastHurt = f;
flag1 = false; flag1 = false;
@ -453,9 +450,6 @@
+ // CraftBukkit start + // CraftBukkit start
+ if (!this.actuallyHurt(damagesource, f)) { + if (!this.actuallyHurt(damagesource, f)) {
+ return false; + return false;
+ }
+ if (this instanceof EntityPlayer && f == 0) { // CraftBukkit - Player entities can't be hurt by 0 damage
+ return false;
+ } + }
this.lastHurt = f; this.lastHurt = f;
- this.invulnerableTime = 20; - this.invulnerableTime = 20;
@ -466,7 +460,7 @@
this.hurtDuration = 10; this.hurtDuration = 10;
this.hurtTime = this.hurtDuration; this.hurtTime = this.hurtDuration;
} }
@@ -1269,7 +1502,7 @@ @@ -1269,7 +1496,7 @@
this.level().broadcastDamageEvent(this, damagesource); this.level().broadcastDamageEvent(this, damagesource);
} }
@ -475,7 +469,7 @@
this.markHurt(); this.markHurt();
} }
@@ -1282,7 +1515,7 @@ @@ -1282,7 +1509,7 @@
d0 = (Math.random() - Math.random()) * 0.01D; d0 = (Math.random() - Math.random()) * 0.01D;
} }
@ -484,7 +478,7 @@
if (!flag) { if (!flag) {
this.indicateDamage(d0, d1); this.indicateDamage(d0, d1);
} }
@@ -1301,7 +1534,7 @@ @@ -1301,7 +1528,7 @@
this.playHurtSound(damagesource); this.playHurtSound(damagesource);
} }
@ -493,7 +487,7 @@
if (flag2) { if (flag2) {
this.lastDamageSource = damagesource; this.lastDamageSource = damagesource;
@@ -1335,7 +1568,7 @@ @@ -1335,7 +1562,7 @@
} }
protected void blockedByShield(EntityLiving entityliving) { protected void blockedByShield(EntityLiving entityliving) {
@ -502,7 +496,7 @@
} }
private boolean checkTotemDeathProtection(DamageSource damagesource) { private boolean checkTotemDeathProtection(DamageSource damagesource) {
@@ -1346,19 +1579,32 @@ @@ -1346,19 +1573,32 @@
EnumHand[] aenumhand = EnumHand.values(); EnumHand[] aenumhand = EnumHand.values();
int i = aenumhand.length; int i = aenumhand.length;
@ -539,7 +533,7 @@
EntityPlayer entityplayer = (EntityPlayer) this; EntityPlayer entityplayer = (EntityPlayer) this;
entityplayer.awardStat(StatisticList.ITEM_USED.get(Items.TOTEM_OF_UNDYING)); entityplayer.awardStat(StatisticList.ITEM_USED.get(Items.TOTEM_OF_UNDYING));
@@ -1367,14 +1613,16 @@ @@ -1367,14 +1607,16 @@
} }
this.setHealth(1.0F); this.setHealth(1.0F);
@ -561,7 +555,7 @@
} }
} }
@@ -1481,14 +1729,22 @@ @@ -1481,14 +1723,22 @@
IBlockData iblockdata = Blocks.WITHER_ROSE.defaultBlockState(); IBlockData iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
if (this.level().getBlockState(blockposition).isAir() && iblockdata.canSurvive(this.level(), blockposition)) { if (this.level().getBlockState(blockposition).isAir() && iblockdata.canSurvive(this.level(), blockposition)) {
@ -586,7 +580,7 @@
this.level().addFreshEntity(entityitem); this.level().addFreshEntity(entityitem);
} }
} }
@@ -1508,21 +1764,40 @@ @@ -1508,21 +1758,40 @@
boolean flag = this.lastHurtByPlayerTime > 0; boolean flag = this.lastHurtByPlayerTime > 0;
@ -630,7 +624,7 @@
} }
@@ -1551,13 +1826,25 @@ @@ -1551,13 +1820,25 @@
} }
public void knockback(double d0, double d1, double d2) { public void knockback(double d0, double d1, double d2) {
@ -659,7 +653,7 @@
} }
} }
@@ -1614,6 +1901,28 @@ @@ -1614,6 +1895,28 @@
return itemstack.getEatingSound(); return itemstack.getEatingSound();
} }
@ -688,7 +682,7 @@
public Optional<BlockPosition> getLastClimbablePos() { public Optional<BlockPosition> getLastClimbablePos() {
return this.lastClimbablePos; return this.lastClimbablePos;
} }
@@ -1669,9 +1978,14 @@ @@ -1669,9 +1972,14 @@
int i = this.calculateFallDamage(f, f1); int i = this.calculateFallDamage(f, f1);
if (i > 0) { if (i > 0) {
@ -704,7 +698,7 @@
return true; return true;
} else { } else {
return flag; return flag;
@@ -1741,7 +2055,7 @@ @@ -1741,7 +2049,7 @@
protected float getDamageAfterArmorAbsorb(DamageSource damagesource, float f) { protected float getDamageAfterArmorAbsorb(DamageSource damagesource, float f) {
if (!damagesource.is(DamageTypeTags.BYPASSES_ARMOR)) { if (!damagesource.is(DamageTypeTags.BYPASSES_ARMOR)) {
@ -713,7 +707,7 @@
f = CombatMath.getDamageAfterAbsorb(f, damagesource, (float) this.getArmorValue(), (float) this.getAttributeValue(GenericAttributes.ARMOR_TOUGHNESS)); f = CombatMath.getDamageAfterAbsorb(f, damagesource, (float) this.getArmorValue(), (float) this.getAttributeValue(GenericAttributes.ARMOR_TOUGHNESS));
} }
@@ -1754,7 +2068,8 @@ @@ -1754,7 +2062,8 @@
} else { } else {
int i; int i;
@ -723,7 +717,7 @@
i = (this.getEffect(MobEffects.DAMAGE_RESISTANCE).getAmplifier() + 1) * 5; i = (this.getEffect(MobEffects.DAMAGE_RESISTANCE).getAmplifier() + 1) * 5;
int j = 25 - i; int j = 25 - i;
float f1 = f * (float) j; float f1 = f * (float) j;
@@ -1787,16 +2102,125 @@ @@ -1787,16 +2096,125 @@
} }
} }
@ -829,7 +823,7 @@
+ if (damagesource.is(DamageTypeTags.DAMAGES_HELMET) && !this.getItemBySlot(EnumItemSlot.HEAD).isEmpty()) { + if (damagesource.is(DamageTypeTags.DAMAGES_HELMET) && !this.getItemBySlot(EnumItemSlot.HEAD).isEmpty()) {
+ this.hurtHelmet(damagesource, f); + this.hurtHelmet(damagesource, f);
+ } + }
+
+ // Apply damage to armor + // Apply damage to armor
+ if (!damagesource.is(DamageTypeTags.BYPASSES_ARMOR)) { + if (!damagesource.is(DamageTypeTags.BYPASSES_ARMOR)) {
+ float armorDamage = (float) (event.getDamage() + event.getDamage(DamageModifier.BLOCKING) + event.getDamage(DamageModifier.HARD_HAT)); + float armorDamage = (float) (event.getDamage() + event.getDamage(DamageModifier.BLOCKING) + event.getDamage(DamageModifier.HARD_HAT));
@ -850,14 +844,14 @@
+ absorptionModifier = (float) -event.getDamage(DamageModifier.ABSORPTION); + absorptionModifier = (float) -event.getDamage(DamageModifier.ABSORPTION);
+ this.setAbsorptionAmount(Math.max(this.getAbsorptionAmount() - absorptionModifier, 0.0F)); + this.setAbsorptionAmount(Math.max(this.getAbsorptionAmount() - absorptionModifier, 0.0F));
+ float f2 = absorptionModifier; + float f2 = absorptionModifier;
+
+ if (f2 > 0.0F && f2 < 3.4028235E37F && this instanceof EntityHuman) { + if (f2 > 0.0F && f2 < 3.4028235E37F && this instanceof EntityHuman) {
+ ((EntityHuman) this).awardStat(StatisticList.DAMAGE_ABSORBED, Math.round(f2 * 10.0F)); + ((EntityHuman) this).awardStat(StatisticList.DAMAGE_ABSORBED, Math.round(f2 * 10.0F));
+ } + }
if (f2 > 0.0F && f2 < 3.4028235E37F) { if (f2 > 0.0F && f2 < 3.4028235E37F) {
Entity entity = damagesource.getEntity(); Entity entity = damagesource.getEntity();
@@ -1807,13 +2231,47 @@ @@ -1807,13 +2225,47 @@
} }
} }
@ -898,7 +892,7 @@
+ +
+ return true; + return true;
+ } else { + } else {
+ return originalDamage >= 0; + return originalDamage > 0;
+ } + }
+ // CraftBukkit end + // CraftBukkit end
} }
@ -907,7 +901,7 @@
} }
public CombatTracker getCombatTracker() { public CombatTracker getCombatTracker() {
@@ -1838,8 +2296,18 @@ @@ -1838,8 +2290,18 @@
} }
public final void setArrowCount(int i) { public final void setArrowCount(int i) {
@ -927,7 +921,7 @@
public final int getStingerCount() { public final int getStingerCount() {
return (Integer) this.entityData.get(EntityLiving.DATA_STINGER_COUNT_ID); return (Integer) this.entityData.get(EntityLiving.DATA_STINGER_COUNT_ID);
@@ -2075,6 +2543,12 @@ @@ -2075,6 +2537,12 @@
public abstract ItemStack getItemBySlot(EnumItemSlot enumitemslot); public abstract ItemStack getItemBySlot(EnumItemSlot enumitemslot);
@ -940,7 +934,7 @@
public abstract void setItemSlot(EnumItemSlot enumitemslot, ItemStack itemstack); public abstract void setItemSlot(EnumItemSlot enumitemslot, ItemStack itemstack);
public Iterable<ItemStack> getHandSlots() { public Iterable<ItemStack> getHandSlots() {
@@ -2328,6 +2802,7 @@ @@ -2328,6 +2796,7 @@
} }
if (this.onGround() && !this.level().isClientSide) { if (this.onGround() && !this.level().isClientSide) {
@ -948,7 +942,7 @@
this.setSharedFlag(7, false); this.setSharedFlag(7, false);
} }
} else { } else {
@@ -2498,7 +2973,7 @@ @@ -2498,7 +2967,7 @@
} }
} }
@ -957,7 +951,7 @@
if (this.tickCount % 20 == 0) { if (this.tickCount % 20 == 0) {
this.getCombatTracker().recheckStatus(); this.getCombatTracker().recheckStatus();
} }
@@ -2602,7 +3077,7 @@ @@ -2602,7 +3071,7 @@
} }
@ -966,7 +960,7 @@
Map<EnumItemSlot, ItemStack> map = this.collectEquipmentChanges(); Map<EnumItemSlot, ItemStack> map = this.collectEquipmentChanges();
if (map != null) { if (map != null) {
@@ -2924,6 +3399,7 @@ @@ -2924,6 +3393,7 @@
} }
if (!this.level().isClientSide) { if (!this.level().isClientSide) {
@ -974,7 +968,7 @@
this.setSharedFlag(7, flag); this.setSharedFlag(7, flag);
} }
@@ -3114,14 +3590,21 @@ @@ -3114,14 +3584,21 @@
@Override @Override
public boolean isPickable() { public boolean isPickable() {
@ -998,7 +992,7 @@
@Override @Override
public float getYHeadRot() { public float getYHeadRot() {
return this.yHeadRot; return this.yHeadRot;
@@ -3314,7 +3797,26 @@ @@ -3314,7 +3791,26 @@
} else { } else {
if (!this.useItem.isEmpty() && this.isUsingItem()) { if (!this.useItem.isEmpty() && this.isUsingItem()) {
this.triggerItemUseEffects(this.useItem, 16); this.triggerItemUseEffects(this.useItem, 16);
@ -1026,7 +1020,7 @@
if (itemstack != this.useItem) { if (itemstack != this.useItem) {
this.setItemInHand(enumhand, itemstack); this.setItemInHand(enumhand, itemstack);
@@ -3392,6 +3894,12 @@ @@ -3392,6 +3888,12 @@
} }
public boolean randomTeleport(double d0, double d1, double d2, boolean flag) { public boolean randomTeleport(double d0, double d1, double d2, boolean flag) {
@ -1039,7 +1033,7 @@
double d3 = this.getX(); double d3 = this.getX();
double d4 = this.getY(); double d4 = this.getY();
double d5 = this.getZ(); double d5 = this.getZ();
@@ -3416,16 +3924,41 @@ @@ -3416,16 +3918,41 @@
} }
if (flag2) { if (flag2) {
@ -1084,7 +1078,7 @@
} else { } else {
if (flag) { if (flag) {
world.broadcastEntityEvent(this, (byte) 46); world.broadcastEntityEvent(this, (byte) 46);
@@ -3437,7 +3970,7 @@ @@ -3437,7 +3964,7 @@
entitycreature.getNavigation().stop(); entitycreature.getNavigation().stop();
} }
@ -1093,7 +1087,7 @@
} }
} }
@@ -3530,7 +4063,7 @@ @@ -3530,7 +4057,7 @@
} }
public void stopSleeping() { public void stopSleeping() {
@ -1102,7 +1096,7 @@
World world = this.level(); World world = this.level();
java.util.Objects.requireNonNull(world); java.util.Objects.requireNonNull(world);
@@ -3564,7 +4097,7 @@ @@ -3564,7 +4091,7 @@
@Nullable @Nullable
public EnumDirection getBedOrientation() { public EnumDirection getBedOrientation() {
@ -1111,7 +1105,7 @@
return blockposition != null ? BlockBed.getBedOrientation(this.level(), blockposition) : null; return blockposition != null ? BlockBed.getBedOrientation(this.level(), blockposition) : null;
} }
@@ -3600,7 +4133,7 @@ @@ -3600,7 +4127,7 @@
FoodInfo.b foodinfo_b = (FoodInfo.b) iterator.next(); FoodInfo.b foodinfo_b = (FoodInfo.b) iterator.next();
if (this.random.nextFloat() < foodinfo_b.probability()) { if (this.random.nextFloat() < foodinfo_b.probability()) {