Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

collide method Test noclip earlier

Browse Source
This commit is contained in:
FatSaw
2022-07-31 06:37:35 +03:00
parent f220a6a153
commit ac24d10a57
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
sources/src/main/java/net/minecraft/server/Entity.java
View File

@@ -1383,37 +1383,33 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
public void d(EntityHuman entityhuman) {} public void d(EntityHuman entityhuman) {}
public void collide(Entity entity) { public void collide(Entity entity) {
if (!this.x(entity)) { if (entity.noclip || this.noclip || this.x(entity)) return; // NeonPaper - Test this earlier
if (!entity.noclip && !this.noclip) { double d0 = entity.locX - this.locX;
double d0 = entity.locX - this.locX; double d1 = entity.locZ - this.locZ;
double d1 = entity.locZ - this.locZ; double d2 = MathHelper.a(d0, d1);
double d2 = MathHelper.a(d0, d1);
if (d2 >= 0.009999999776482582D) { if (d2 >= 0.009999999776482582D) {
d2 = (double) MathHelper.sqrt(d2); d2 = (double) MathHelper.sqrt(d2);
d0 /= d2; d0 /= d2;
d1 /= d2; d1 /= d2;
double d3 = 1.0D / d2; double d3 = 1.0D / d2;
if (d3 > 1.0D) { if (d3 > 1.0D) {
d3 = 1.0D; d3 = 1.0D;
} }
d0 *= d3; d0 *= d3;
d1 *= d3; d1 *= d3;
d0 *= 0.05000000074505806D; d0 *= 0.05000000074505806D;
d1 *= 0.05000000074505806D; d1 *= 0.05000000074505806D;
d0 *= (double) (1.0F - this.R); d0 *= (double) (1.0F - this.R);
d1 *= (double) (1.0F - this.R); d1 *= (double) (1.0F - this.R);
if (!this.isVehicle()) { if (!this.isVehicle()) {
this.f(-d0, 0.0D, -d1); this.f(-d0, 0.0D, -d1);
} }
if (!entity.isVehicle()) {
entity.f(d0, 0.0D, d1);
}
}
if (!entity.isVehicle()) {
entity.f(d0, 0.0D, d1);
} }
} }
} }