26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From e56809d3744900d2ce7713bd85fa27c579012fe2 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
|
|
<tsao-chi@the-lingo.org>
|
|
Date: Fri, 10 Apr 2020 15:47:15 +0800
|
|
Subject: [PATCH] Swaps the predicate order of collision
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index b290f64fa1..fb21da032a 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -1403,8 +1403,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
|
public void pickup(EntityHuman entityhuman) {}
|
|
|
|
public void collide(Entity entity) {
|
|
+ if (entity.noclip || this.noclip) return; // Akarin - Test this earlier
|
|
if (!this.isSameVehicle(entity)) {
|
|
- if (!entity.noclip && !this.noclip) {
|
|
+ if (true || !entity.noclip && !this.noclip) { // Akarin - Moved up
|
|
double d0 = entity.locX() - this.locX();
|
|
double d1 = entity.locZ() - this.locZ();
|
|
double d2 = MathHelper.a(d0, d1);
|
|
--
|
|
2.25.1.windows.1
|
|
|