mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 22:45:31 +01:00
Update upstream
This commit is contained in:
parent
ef3f6a481a
commit
189235906d
3 changed files with 2 additions and 17 deletions
|
@ -1,4 +1,4 @@
|
|||
From 69a4afa23cc7540a32edb3561eeacd3a5e7ace45 Mon Sep 17 00:00:00 2001
|
||||
From 92192f36f2eed7394532ea5778417ea4668afebe Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Thu, 7 Apr 2016 18:28:06 -0500
|
||||
Subject: [PATCH] 16w14a memory cleanup
|
||||
|
@ -22,20 +22,6 @@ index 51f3758..acbc70a 100644
|
|||
|
||||
protected PathPoint a(int i, int j, int k) {
|
||||
int l = PathPoint.b(i, j, k);
|
||||
diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
|
||||
index 0e4fa08..4f1df46 100644
|
||||
--- a/src/main/java/net/minecraft/server/PathfinderNormal.java
|
||||
+++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
|
||||
@@ -16,8 +16,8 @@ public class PathfinderNormal extends PathfinderAbstract {
|
||||
}
|
||||
|
||||
public void a() {
|
||||
- super.a();
|
||||
this.b.a(PathType.WATER, this.j);
|
||||
+ super.a(); // Paper - 16w14a backports
|
||||
}
|
||||
|
||||
public PathPoint b() {
|
||||
diff --git a/src/main/java/net/minecraft/server/PathfinderWater.java b/src/main/java/net/minecraft/server/PathfinderWater.java
|
||||
index dc7f310..c1df684 100644
|
||||
--- a/src/main/java/net/minecraft/server/PathfinderWater.java
|
||||
|
|
|
@ -60,7 +60,6 @@ import PacketPlayOutTitle
|
|||
import PacketPlayOutUpdateTime
|
||||
import PathfinderAbstract
|
||||
import PathfinderGoalFloat
|
||||
import PathfinderNormal
|
||||
import PathfinderWater
|
||||
import PersistentVillage
|
||||
import TileEntityEnderChest
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit a28f87a55c1eef87d4f9b88dafc0996d00d6b20a
|
||||
Subproject commit f6313791d0f8575e4a3a35c11145f794b8acedd4
|
Loading…
Reference in a new issue