Fix TODOs in Optional TNT doesn't move in water

Turns out the doWaterMovement method was never called.
Moved the tracker updates into tick() and delete doWaterMovement
This commit is contained in:
Spottedleaf
2019-05-12 16:42:49 -07:00
committed by Zach
parent 5a44b38dc5
commit dc97f7d401
11 changed files with 92 additions and 124 deletions

View File

@@ -1,4 +1,4 @@
From ca4d62e9d537d9d2bbee183c3730cf5788e3fd20 Mon Sep 17 00:00:00 2001
From 0d182f9394258fa2098734587c774a3a81eef263 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 22 Sep 2018 00:33:08 -0500
Subject: [PATCH] Add LivingEntity#getTargetEntity
@@ -46,10 +46,10 @@ index b38fc50bb..d02c77664 100644
double[] adouble = new double[] { 1.0D};
double d0 = vec3d1.x - vec3d.x;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 506851111..1cb96685a 100644
index b1ab590d1..0adf4b69a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1449,6 +1449,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1443,6 +1443,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.c(f - 90.0F, f1);
}
@@ -57,7 +57,7 @@ index 506851111..1cb96685a 100644
public Vec3D j(float f) {
if (f == 1.0F) {
return new Vec3D(this.locX, this.locY + (double) this.getHeadHeight(), this.locZ);
@@ -2095,6 +2096,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2089,6 +2090,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.getPassengers().size() < 1;
}
@@ -66,7 +66,7 @@ index 506851111..1cb96685a 100644
return 0.0F;
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index a9d7eea36..dacaa16e0 100644
index 3e819f540..20e8ae96d 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3217,6 +3217,37 @@ public abstract class EntityLiving extends Entity {