Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

one punch!! improvements

Browse Source 
- go back to setting attack damage to a really high value
- move above event calls to allow plugin manipulation
- ignore damage from projectiles
This commit is contained in:
granny
2024-05-30 22:09:44 -07:00
parent ee56117c43
commit 847719c323
5 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0255-Remove-Mojang-Profiler.patch
View File

@@ -1211,7 +1211,7 @@ index d42cf771b9cf77304d5174f374c56eb793fc2991..45e06ec0e975973edb4434f64ddfc0f6
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 2fa0404f4f4a332248cdf7e84f2d9723dda7df8b..3c132007cc40a330693e33350e0cad087ac4c90b 100644
index ceb420d3b9c5d3050b0d72ae612b8003d562202a..05644dd1872d8b558ed64f74fc8699d651cc893e 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -423,7 +423,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1232,7 +1232,7 @@ index 2fa0404f4f4a332248cdf7e84f2d9723dda7df8b..3c132007cc40a330693e33350e0cad08
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3217,10 +3217,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3220,10 +3220,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1246,7 +1246,7 @@ index 2fa0404f4f4a332248cdf7e84f2d9723dda7df8b..3c132007cc40a330693e33350e0cad08
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3232,7 +3232,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3235,7 +3235,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1255,7 +1255,7 @@ index 2fa0404f4f4a332248cdf7e84f2d9723dda7df8b..3c132007cc40a330693e33350e0cad08
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3455,19 +3455,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3458,19 +3458,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1280,7 +1280,7 @@ index 2fa0404f4f4a332248cdf7e84f2d9723dda7df8b..3c132007cc40a330693e33350e0cad08
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3494,8 +3494,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3497,8 +3497,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1291,7 +1291,7 @@ index 2fa0404f4f4a332248cdf7e84f2d9723dda7df8b..3c132007cc40a330693e33350e0cad08
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3520,8 +3520,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3523,8 +3523,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1302,7 +1302,7 @@ index 2fa0404f4f4a332248cdf7e84f2d9723dda7df8b..3c132007cc40a330693e33350e0cad08
if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3538,15 +3538,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3541,15 +3541,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}