mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
51 lines
3.0 KiB
Diff
51 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Fri, 28 Jan 2022 18:34:29 +0800
|
|
Subject: [PATCH] Make snowball and egg can knockback player
|
|
|
|
|
|
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 718e120c9768cf716b32d3d652f53f1dda925168..21f5c59e7e01ffefdb077d1aa9853935a8fa6b0f 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
|
|
@@ -3,6 +3,7 @@ package net.minecraft.world.entity.projectile;
|
|
import net.minecraft.core.particles.ItemParticleOption;
|
|
import net.minecraft.core.particles.ParticleOptions;
|
|
import net.minecraft.core.particles.ParticleTypes;
|
|
+import net.minecraft.server.level.ServerPlayer;
|
|
import net.minecraft.world.entity.Entity;
|
|
import net.minecraft.world.entity.EntityType;
|
|
import net.minecraft.world.entity.LivingEntity;
|
|
@@ -55,6 +56,12 @@ public class Snowball extends ThrowableItemProjectile {
|
|
Entity entity = entityHitResult.getEntity();
|
|
int i = entity instanceof Blaze ? 3 : 0;
|
|
entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float)i);
|
|
+ // Leaves start - make snowball can knockback player
|
|
+ if (top.leavesmc.leaves.LeavesConfig.snowballAndEggCanKnockback && 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(), this);
|
|
+ }
|
|
+ // Leaves end - make snowball can knockback player
|
|
}
|
|
|
|
@Override
|
|
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 588e5ac6fc9b2d12be3bb80bc3fe50d81470c441..e79d994bb855626e740e23de564f73924a1f5098 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
|
|
@@ -45,7 +45,14 @@ public class ThrownEgg extends ThrowableItemProjectile {
|
|
@Override
|
|
protected void onHitEntity(EntityHitResult entityHitResult) {
|
|
super.onHitEntity(entityHitResult);
|
|
+ Entity entity = entityHitResult.getEntity(); // Leaves - make egg can knockback player
|
|
entityHitResult.getEntity().hurt(this.damageSources().thrown(this, this.getOwner()), 0.0F);
|
|
+ // Leaves start - make egg can knockback player
|
|
+ if (top.leavesmc.leaves.LeavesConfig.snowballAndEggCanKnockback && 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(), this);
|
|
+ }
|
|
+ // Leaves end - make egg can knockback player
|
|
}
|
|
|
|
@Override
|