Update upstream

This commit is contained in:
William Blake Galbreath
2019-05-27 09:44:31 -05:00
parent b4a9e34f46
commit d03525d9f3
5 changed files with 152 additions and 50 deletions

View File

@@ -1,4 +1,4 @@
From 132991733ea1452650a9aac46b3f7477659ff4e6 Mon Sep 17 00:00:00 2001
From 4092f0654e1564971542f82e7c13d7957f762976 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 11 May 2019 01:31:50 -0500
Subject: [PATCH] Villager shops
@@ -283,10 +283,10 @@ index 000000000..eb7213217
+ }
+}
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index 1bf7ead71..46a6511f7 100644
index 856ff22b0..8ed86e25f 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -125,6 +125,7 @@ public abstract class NavigationAbstract {
@@ -123,6 +123,7 @@ public abstract class NavigationAbstract {
}
}
@@ -294,7 +294,7 @@ index 1bf7ead71..46a6511f7 100644
public boolean a(double d0, double d1, double d2, double d3) {
return this.a(this.a(d0, d1, d2), d3);
}
@@ -258,6 +259,7 @@ public abstract class NavigationAbstract {
@@ -255,6 +256,7 @@ public abstract class NavigationAbstract {
}