SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstream

Browse Source
This commit is contained in:
Zach Brown
2016-04-12 11:31:54 -05:00
parent f54aa3ca2c
commit 14f6bee0a1
3 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Spigot-Server-Patches/16w14a-memory-cleanup.patch
View File

@@ -22,20 +22,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
protected PathPoint a(int i, int j, int k) { protected PathPoint a(int i, int j, int k) {
int l = PathPoint.b(i, j, 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/PathfinderNormal.java
+++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
@@ -0,0 +0,0 @@ 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 diff --git a/src/main/java/net/minecraft/server/PathfinderWater.java b/src/main/java/net/minecraft/server/PathfinderWater.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/PathfinderWater.java --- a/src/main/java/net/minecraft/server/PathfinderWater.java

1
scripts/importmcdev.sh
View File

@@ -60,7 +60,6 @@ import PacketPlayOutTitle
import PacketPlayOutUpdateTime import PacketPlayOutUpdateTime
import PathfinderAbstract import PathfinderAbstract
import PathfinderGoalFloat import PathfinderGoalFloat
import PathfinderNormal
import PathfinderWater import PathfinderWater
import PersistentVillage import PersistentVillage
import TileEntityEnderChest import TileEntityEnderChest

2
work/CraftBukkit

Submodule work/CraftBukkit updated: a28f87a55c...f6313791d0