Update upstream

This commit is contained in:
William Blake Galbreath
2019-06-28 06:26:34 -05:00
parent 7a4c08bac1
commit 6536946ca3
3 changed files with 2 additions and 27 deletions

2
Paper

Submodule Paper updated: aa8483ea7e...1019a87c2c

View File

@@ -1 +1 @@
1.14.3--125e6c31a206f5aeb1b083efffd336ae48261315
1.14.3--76b4ee9d22d16dfae7900f80297a624627b04619

View File

@@ -1,25 +0,0 @@
From c0c66a55d461ec92ce8ac860f58d104a5e608913 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 28 Jun 2019 01:38:51 -0500
Subject: [PATCH] Fix passive mobs not moving (PaperGH-2232)
---
src/main/java/net/minecraft/server/RandomPositionGenerator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
index 8ba69380b7..a163020199 100644
--- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
+++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
@@ -99,7 +99,7 @@ public class RandomPositionGenerator {
}
blockposition2 = new BlockPosition((double) l + entitycreature.locX, (double) i1 + entitycreature.locY, (double) j1 + entitycreature.locZ);
- if (!entitycreature.world.isLoaded(blockposition1)) continue; // Paper
+ if (!entitycreature.world.isLoaded(blockposition2)) continue; // Paper // Purpur - fix passive mobs not moving
if ((!flag1 || entitycreature.a(blockposition2)) && navigationabstract.a(blockposition2)) {
if (!flag) {
blockposition2 = a(blockposition2, entitycreature);
--
2.20.1