Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +01:00
20 Zeilen
1.2 KiB
Diff
20 Zeilen
1.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
||
|
|
Date: Thu, 16 Mar 2023 10:04:17 +0100
|
||
|
|
Subject: [PATCH] Dont change Interaction attack damage source
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Interaction.java b/src/main/java/net/minecraft/world/entity/Interaction.java
|
||
|
|
index ee9222406bcaef1a1ac09b60a142044c70d31fce..4f1a2b8bb3b837f5e6f7888f267701b789ea5c02 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Interaction.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Interaction.java
|
||
|
|
@@ -155,7 +155,7 @@ public class Interaction extends Entity implements Attackable, Targeting {
|
||
|
|
if (entityhuman instanceof ServerPlayer) {
|
||
|
|
ServerPlayer entityplayer = (ServerPlayer) entityhuman;
|
||
|
|
|
||
|
|
- CriteriaTriggers.PLAYER_HURT_ENTITY.trigger(entityplayer, this, source, (float) event.getFinalDamage(), 1.0F, false); // CraftBukkit
|
||
|
|
+ CriteriaTriggers.PLAYER_HURT_ENTITY.trigger(entityplayer, this, entityhuman.damageSources().generic(), (float) event.getFinalDamage(), 1.0F, false); // CraftBukkit // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
return !this.getResponse();
|