one punch!! improvements

- 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

View File

@@ -32,7 +32,7 @@ index 0eea9e29170a365e96659bcea2dea283d6f1ceda..ed2b8138d23e94b5471181396f290c53
return this.hardCollides;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 15f89efd59c7f6334483c67d49e3de6dd03921c9..12f37b245901b84b4cee4e75d38446a554b2274b 100644
index 64642403d6821d149e2acc3a4cac43ef19b4dd3d..753b1220ecf63914920ef85292db47d006ecfa27 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -274,6 +274,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -63,7 +63,7 @@ index 15f89efd59c7f6334483c67d49e3de6dd03921c9..12f37b245901b84b4cee4e75d38446a5
}
// CraftBukkit start
@@ -3563,6 +3570,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3566,6 +3573,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().drown(), 1.0F);
}