mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-31 04:46:38 +00:00
72 lines
4.0 KiB
Diff
72 lines
4.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: lilingfengdev <145678359+lilingfengdev@users.noreply.github.com>
|
|
Date: Thu, 18 Jan 2024 13:30:02 +0800
|
|
Subject: [PATCH] Polpot: Make egg and snowball can knockback player
|
|
|
|
Original project: https://github.com/HaHaWTH/Polpot
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
|
|
index 1b9d0e28e518c501b4b93ae385ddd64aeade97d5..650e0e88e2a608fe6326806a830e437cf75a9e4f 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
|
|
@@ -61,6 +61,12 @@ public class Snowball extends ThrowableItemProjectile {
|
|
int i = entity.level().purpurConfig.snowballDamage >= 0 ? entity.level().purpurConfig.snowballDamage : entity instanceof Blaze ? 3 : 0; // Purpur
|
|
|
|
entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float) i);
|
|
+ // Leaf start - Polpot - Make snowball can knockback player
|
|
+ if (org.dreeam.leaf.config.modules.gameplay.Knockback.snowballCanKnockback && entity instanceof net.minecraft.server.level.ServerPlayer) {
|
|
+ entity.hurt(this.damageSources().thrown(this, this.getOwner()), 0.0000001F);
|
|
+ ((net.minecraft.server.level.ServerPlayer) entity).knockback(0.4000000059604645D, this.getX() - entity.getX(), this.getZ() - entity.getZ());
|
|
+ }
|
|
+ // Leaf end - Polpot - Make snowball can knockback player
|
|
}
|
|
|
|
// Purpur start - borrowed and modified code from ThrownPotion#onHitBlock and ThrownPotion#dowseFire
|
|
diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
|
|
index dbd60cc8c39f5d2d4c77e2de4f2567e7fa456cd2..94baa609e49db229b03592c3fddb388b7499d75b 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
|
|
@@ -49,7 +49,14 @@ public class ThrownEgg extends ThrowableItemProjectile {
|
|
@Override
|
|
protected void onHitEntity(EntityHitResult entityHitResult) {
|
|
super.onHitEntity(entityHitResult);
|
|
+ Entity entity = entityHitResult.getEntity(); // Polpot - make egg can knockback player
|
|
entityHitResult.getEntity().hurt(this.damageSources().thrown(this, this.getOwner()), 0.0F);
|
|
+ // Leaf start - Polpot - Make egg can knockback player
|
|
+ if (org.dreeam.leaf.config.modules.gameplay.Knockback.eggCanKnockback && entity instanceof ServerPlayer) {
|
|
+ entity.hurt(this.damageSources().thrown(this, this.getOwner()), 0.0000001F);
|
|
+ ((ServerPlayer) entity).knockback(0.4000000059604645D, this.getX() - entity.getX(), this.getZ() - entity.getZ());
|
|
+ }
|
|
+ // Leaf end - Polpot - Make egg can knockback player
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/org/dreeam/leaf/config/modules/gameplay/Knockback.java b/src/main/java/org/dreeam/leaf/config/modules/gameplay/Knockback.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..35e8a9568cd37f4ed75d10a38beea996c8729388
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/dreeam/leaf/config/modules/gameplay/Knockback.java
|
|
@@ -0,0 +1,22 @@
|
|
+package org.dreeam.leaf.config.modules.gameplay;
|
|
+
|
|
+import org.dreeam.leaf.config.ConfigModules;
|
|
+import org.dreeam.leaf.config.EnumConfigCategory;
|
|
+
|
|
+public class Knockback extends ConfigModules {
|
|
+
|
|
+ public String getBasePath() {
|
|
+ return EnumConfigCategory.GAMEPLAY.getBaseKeyName() + ".knockback";
|
|
+ }
|
|
+
|
|
+ public static boolean snowballCanKnockback = false;
|
|
+ public static boolean eggCanKnockback = false;
|
|
+
|
|
+ @Override
|
|
+ public void onLoaded() {
|
|
+ snowballCanKnockback = config.getBoolean(getBasePath() + ".snowball-knockback-players", snowballCanKnockback,
|
|
+ "Make snowball can knockback players");
|
|
+ eggCanKnockback = config.getBoolean(getBasePath() + ".egg-knockback-players", eggCanKnockback,
|
|
+ "Make egg can knockback players");
|
|
+ }
|
|
+}
|