OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-17 06:48:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Pass predicate from default get hard colliding entities method

Browse source
This commit is contained in:
Spottedleaf 2020-06-26 14:33:49 -07:00
parent 6e59ab0eb5
commit 9b3bb0cf51
5 changed files with 26 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Spigot-Server-Patches/Anti-Xray.patch
View file

@ -895,13 +895,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ bitInLongIndex += bitsPerObject; + bitInLongIndex += bitsPerObject;
+ +
+ if (bitInLongIndex > 63) { + if (bitInLongIndex > 63) {
+ bitInLongIndex -= 64; + bitInLongIndex = 0;
+ longInDataBitsIndex += 8; + longInDataBitsIndex += 8;
+ init(); + init();
+
+ if (bitInLongIndex > 0) {
+ value |= current << bitsPerObject - bitInLongIndex & mask;
+ }
+ } + }
+ +
+ return value; + return value;
@ -975,14 +971,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ if (bitInLongIndex > 63) { + if (bitInLongIndex > 63) {
+ finish(); + finish();
+ bitInLongIndex -= 64; + bitInLongIndex = 0;
+ longInDataBitsIndex += 8; + longInDataBitsIndex += 8;
+ init(); + init();
+
+ if (bitInLongIndex > 0) {
+ current = current & ~(mask >>> bitsPerObject - bitInLongIndex) | (value & mask) >>> bitsPerObject - bitInLongIndex;
+ dirty = true;
+ }
+ } + }
+ } + }
+ +
@ -991,7 +982,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ if (bitInLongIndex > 63) { + if (bitInLongIndex > 63) {
+ finish(); + finish();
+ bitInLongIndex -= 64; + bitInLongIndex = 0;
+ longInDataBitsIndex += 8; + longInDataBitsIndex += 8;
+ init(); + init();
+ } + }

40
Spigot-Server-Patches/Implement-EntityKnockbackByEntityEvent.patch
View file

@ -13,9 +13,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (flag5) { if (flag5) {
if (i > 0) { if (i > 0) {
if (entity instanceof EntityLiving) { if (entity instanceof EntityLiving) {
+ ((EntityLiving) entity).knockingBackEntity = this; // Paper - ((EntityLiving) entity).a((float) i * 0.5F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)));
((EntityLiving) entity).a((float) i * 0.5F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F))); + ((EntityLiving) entity).doKnockback((float) i * 0.5F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)), this); // Paper
+ ((EntityLiving) entity).knockingBackEntity = null; // Paper
} else { } else {
entity.h((double) (-MathHelper.sin(this.yaw * 0.017453292F) * (float) i * 0.5F), 0.1D, (double) (MathHelper.cos(this.yaw * 0.017453292F) * (float) i * 0.5F)); entity.h((double) (-MathHelper.sin(this.yaw * 0.017453292F) * (float) i * 0.5F), 0.1D, (double) (MathHelper.cos(this.yaw * 0.017453292F) * (float) i * 0.5F));
} }
@ -23,9 +22,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (entityliving != this && entityliving != entity && !this.r(entityliving) && (!(entityliving instanceof EntityArmorStand) || !((EntityArmorStand) entityliving).isMarker()) && this.h((Entity) entityliving) < 9.0D) { if (entityliving != this && entityliving != entity && !this.r(entityliving) && (!(entityliving instanceof EntityArmorStand) || !((EntityArmorStand) entityliving).isMarker()) && this.h((Entity) entityliving) < 9.0D) {
// CraftBukkit start - Only apply knockback if the damage hits // CraftBukkit start - Only apply knockback if the damage hits
if (entityliving.damageEntity(DamageSource.playerAttack(this).sweep(), f4)) { if (entityliving.damageEntity(DamageSource.playerAttack(this).sweep(), f4)) {
+ ((EntityLiving) entity).knockingBackEntity = this; // Paper - entityliving.a(0.4F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)));
entityliving.a(0.4F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F))); + entityliving.doKnockback(0.4F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)), this);
+ ((EntityLiving) entity).knockingBackEntity = null; // Paper
} }
// CraftBukkit end // CraftBukkit end
} }
@ -37,9 +35,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (flag) { if (flag) {
if (f1 > 0.0F && entity instanceof EntityLiving) { if (f1 > 0.0F && entity instanceof EntityLiving) {
+ ((EntityLiving) entity).knockingBackEntity = this; // Paper - ((EntityLiving) entity).a(f1 * 0.5F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)));
((EntityLiving) entity).a(f1 * 0.5F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F))); + ((EntityLiving) entity).doKnockback(f1 * 0.5F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)), this);
+ ((EntityLiving) entity).knockingBackEntity = null; // Paper
this.setMot(this.getMot().d(0.6D, 1.0D, 0.6D)); this.setMot(this.getMot().d(0.6D, 1.0D, 0.6D));
} }
@ -51,9 +48,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
this.aw = (float) (MathHelper.d(d1, d0) * 57.2957763671875D - (double) this.yaw); this.aw = (float) (MathHelper.d(d1, d0) * 57.2957763671875D - (double) this.yaw);
+ this.knockingBackEntity = entity1 instanceof EntityLiving ? ((EntityLiving) entity1) : null; // Paper - this.a(0.4F, d0, d1);
this.a(0.4F, d0, d1); + this.doKnockback(0.4F, d0, d1, entity1); // Paper
+ this.knockingBackEntity = null; // Paper
} else { } else {
this.aw = (float) ((int) (Math.random() * 2.0D) * 180); this.aw = (float) ((int) (Math.random() * 2.0D) * 180);
} }
@ -61,12 +57,23 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
protected void f(EntityLiving entityliving) { protected void f(EntityLiving entityliving) {
+ ((EntityLiving) entityliving).knockingBackEntity = this; // Paper - entityliving.a(0.5F, entityliving.locX() - this.locX(), entityliving.locZ() - this.locZ());
entityliving.a(0.5F, entityliving.locX() - this.locX(), entityliving.locZ() - this.locZ()); + entityliving.doKnockback(0.5F, entityliving.locX() - this.locX(), entityliving.locZ() - this.locZ(), this);
+ ((EntityLiving) entityliving).knockingBackEntity = null; // Paper
} }
private boolean f(DamageSource damagesource) { private boolean f(DamageSource damagesource) {
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
}
public void a(float f, double d0, double d1) {
+ // Paper start - add knockbacking entity parameter
+ this.doKnockback(f, d0, d1, null);
+ }
+ public void doKnockback(float f, double d0, double d1, Entity knockingBackEntity) {
+ // Paper end - add knockbacking entity parameter
f = (float) ((double) f * (1.0D - this.b(GenericAttributes.KNOCKBACK_RESISTANCE)));
if (f > 0.0F) {
this.impulse = true;
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity { @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
Vec3D vec3d1 = (new Vec3D(d0, 0.0D, d1)).d().a((double) f); Vec3D vec3d1 = (new Vec3D(d0, 0.0D, d1)).d().a((double) f);
@ -83,7 +90,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper end + // Paper end
} }
} }
+ EntityLiving knockingBackEntity; // Paper
@Nullable
protected SoundEffect getSoundHurt(DamageSource damagesource) {

2
Spigot-Server-Patches/Optimise-entity-hard-collision-checking.patch
View file

@ -157,7 +157,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * Not guaranteed to only return hard colliding entites + * Not guaranteed to only return hard colliding entites
+ */ + */
+ default List<Entity> getHardCollidingEntities(@Nullable Entity entity, AxisAlignedBB axisalignedbb, Predicate<Entity> predicate) { + default List<Entity> getHardCollidingEntities(@Nullable Entity entity, AxisAlignedBB axisalignedbb, Predicate<Entity> predicate) {
+ return this.getEntities(entity, axisalignedbb); + return this.getEntities(entity, axisalignedbb, predicate);
+ } + }
+ // Paper end - optimise hard collision + // Paper end - optimise hard collision
+ +

54
Spigot-Server-Patches/fixup-Anti-Xray.patch
View file

@ -1,54 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 26 Jun 2020 14:10:10 -0700
Subject: [PATCH] fixup! Anti-Xray
diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
+++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
@@ -0,0 +0,0 @@ public final class DataBitsReader {
bitInLongIndex += bitsPerObject;
if (bitInLongIndex > 63) {
- bitInLongIndex -= 64;
+ bitInLongIndex = 0;
longInDataBitsIndex += 8;
init();
-
- if (bitInLongIndex > 0) {
- value |= current << bitsPerObject - bitInLongIndex & mask;
- }
}
return value;
diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
+++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
@@ -0,0 +0,0 @@ public final class DataBitsWriter {
if (bitInLongIndex > 63) {
finish();
- bitInLongIndex -= 64;
+ bitInLongIndex = 0;
longInDataBitsIndex += 8;
init();
-
- if (bitInLongIndex > 0) {
- current = current & ~(mask >>> bitsPerObject - bitInLongIndex) | (value & mask) >>> bitsPerObject - bitInLongIndex;
- dirty = true;
- }
}
}
@@ -0,0 +0,0 @@ public final class DataBitsWriter {
if (bitInLongIndex > 63) {
finish();
- bitInLongIndex -= 64;
+ bitInLongIndex = 0;
longInDataBitsIndex += 8;
init();
}

93
Spigot-Server-Patches/fixup-Implement-EntityKnockbackByEntityEvent.patch
View file

@ -1,93 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 26 Jun 2020 14:28:49 -0700
Subject: [PATCH] fixup! Implement EntityKnockbackByEntityEvent
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
if (flag5) {
if (i > 0) {
if (entity instanceof EntityLiving) {
- ((EntityLiving) entity).knockingBackEntity = this; // Paper
- ((EntityLiving) entity).a((float) i * 0.5F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)));
- ((EntityLiving) entity).knockingBackEntity = null; // Paper
+ ((EntityLiving) entity).doKnockback((float) i * 0.5F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)), this); // Paper
} else {
entity.h((double) (-MathHelper.sin(this.yaw * 0.017453292F) * (float) i * 0.5F), 0.1D, (double) (MathHelper.cos(this.yaw * 0.017453292F) * (float) i * 0.5F));
}
@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
if (entityliving != this && entityliving != entity && !this.r(entityliving) && (!(entityliving instanceof EntityArmorStand) || !((EntityArmorStand) entityliving).isMarker()) && this.h((Entity) entityliving) < 9.0D) {
// CraftBukkit start - Only apply knockback if the damage hits
if (entityliving.damageEntity(DamageSource.playerAttack(this).sweep(), f4)) {
- ((EntityLiving) entity).knockingBackEntity = this; // Paper
- entityliving.a(0.4F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)));
- ((EntityLiving) entity).knockingBackEntity = null; // Paper
+ entityliving.doKnockback(0.4F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)), this);
}
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
if (flag) {
if (f1 > 0.0F && entity instanceof EntityLiving) {
- ((EntityLiving) entity).knockingBackEntity = this; // Paper
- ((EntityLiving) entity).a(f1 * 0.5F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)));
- ((EntityLiving) entity).knockingBackEntity = null; // Paper
+ ((EntityLiving) entity).doKnockback(f1 * 0.5F, (double) MathHelper.sin(this.yaw * 0.017453292F), (double) (-MathHelper.cos(this.yaw * 0.017453292F)), this);
this.setMot(this.getMot().d(0.6D, 1.0D, 0.6D));
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
}
this.aw = (float) (MathHelper.d(d1, d0) * 57.2957763671875D - (double) this.yaw);
- this.knockingBackEntity = entity1 instanceof EntityLiving ? ((EntityLiving) entity1) : null; // Paper
- this.a(0.4F, d0, d1);
- this.knockingBackEntity = null; // Paper
+ this.doKnockback(0.4F, d0, d1, entity1); // Paper
} else {
this.aw = (float) ((int) (Math.random() * 2.0D) * 180);
}
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
}
protected void f(EntityLiving entityliving) {
- ((EntityLiving) entityliving).knockingBackEntity = this; // Paper
- entityliving.a(0.5F, entityliving.locX() - this.locX(), entityliving.locZ() - this.locZ());
- ((EntityLiving) entityliving).knockingBackEntity = null; // Paper
+ entityliving.doKnockback(0.5F, entityliving.locX() - this.locX(), entityliving.locZ() - this.locZ(), this);
}
private boolean f(DamageSource damagesource) {
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
}
public void a(float f, double d0, double d1) {
+ // Paper start - add knockbacking entity parameter
+ this.doKnockback(f, d0, d1, null);
+ }
+ public void doKnockback(float f, double d0, double d1, Entity knockingBackEntity) {
+ // Paper end - add knockbacking entity parameter
f = (float) ((double) f * (1.0D - this.b(GenericAttributes.KNOCKBACK_RESISTANCE)));
if (f > 0.0F) {
this.impulse = true;
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
// Paper end
}
}
- EntityLiving knockingBackEntity; // Paper
@Nullable
protected SoundEffect getSoundHurt(DamageSource damagesource) {