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

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

@@ -1383,8 +1383,7 @@ 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);
@@ -1413,9 +1412,6 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
entity.f(d0, 0.0D, d1); entity.f(d0, 0.0D, d1);
} }
} }
}
}
} }
public void f(double d0, double d1, double d2) { public void f(double d0, double d1, double d2) {