Move all ScriptEngines to Entity

This commit is contained in:
William Blake Galbreath
2021-06-25 20:15:17 -05:00
parent 4a2d580185
commit 1b9d201bed
8 changed files with 34 additions and 38 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add critical hit check to EntityDamagedByEntityEvent
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 3dc2ebc102fe3f575eede672509f330271571575..e15155c01b94d2f52182d28bebf2b5db65acdb97 100644
index 831a62e56c745884f34fb5d8f84f037543d77d1d..d4e6c16b08c5aaf9c50467941498b566f11cc5d2 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -182,6 +182,7 @@ public abstract class Player extends LivingEntity {
@@ -16,7 +16,7 @@ index 3dc2ebc102fe3f575eede672509f330271571575..e15155c01b94d2f52182d28bebf2b5db
// CraftBukkit start
public boolean fauxSleeping;
@@ -1247,6 +1248,7 @@ public abstract class Player extends LivingEntity {
@@ -1245,6 +1246,7 @@ public abstract class Player extends LivingEntity {
flag2 = flag2 && !level.paperConfig.disablePlayerCrits; // Paper
flag2 = flag2 && !this.isSprinting();
if (flag2) {
@@ -24,7 +24,7 @@ index 3dc2ebc102fe3f575eede672509f330271571575..e15155c01b94d2f52182d28bebf2b5db
f *= 1.5F;
}
@@ -1283,6 +1285,7 @@ public abstract class Player extends LivingEntity {
@@ -1281,6 +1283,7 @@ public abstract class Player extends LivingEntity {
Vec3 vec3d = target.getDeltaMovement();
boolean flag5 = target.hurt(DamageSource.playerAttack(this), f);