From 7290b5ae145e1a7c19ab2b65ae6de6da698bd96c Mon Sep 17 00:00:00 2001
From: Adrian Siekierka <kontakt@asie.pl>
Date: Thu, 9 May 2019 17:00:37 +0200
Subject: [PATCH] 1.14.1 Pre-Release 2

---
 build.gradle                                           |  2 +-
 .../entity/ai/pathing/LandPathNodeMaker.mapping        | 10 +++++-----
 .../minecraft/server/world/ServerChunkManager.mapping  |  4 ++--
 .../minecraft/server/world/ServerTickScheduler.mapping |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index bda5165f1d..459d613608 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ plugins {
 	id 'maven-publish'
 }
 
-def minecraft_version = "1.14.1 Pre-Release 1"
+def minecraft_version = "1.14.1 Pre-Release 2"
 
 def ENV = System.getenv()
 // Fetch build number from Jenkins
diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping
index 52e9286696..ff5c653279 100644
--- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping
+++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping
@@ -1,16 +1,16 @@
 CLASS cnn net/minecraft/entity/ai/pathing/LandPathNodeMaker
 	FIELD j waterPathNodeTypeWeight F
+	METHOD a getPathNode (IIIIDLfa;)Lcng;
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 maxYStep
 	METHOD a getPathNodeType (Lais;III)Lcne;
 		ARG 1 entity
 		ARG 2 x
 		ARG 3 y
 	METHOD a getPathNodeType (Lais;Lev;)Lcne;
 		ARG 1 entity
-	METHOD b getPathNode (IIIIDLfa;)Lcng;
-		ARG 1 x
-		ARG 2 y
-		ARG 3 z
-		ARG 4 maxYStep
 	METHOD b getBasicPathNodeType (Lbgs;III)Lcne;
 		ARG 1 blockView
 		ARG 2 x
diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping
index cc20f21c31..b5a6b0c10c 100644
--- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping
+++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping
@@ -20,8 +20,6 @@ CLASS ve net/minecraft/server/world/ServerChunkManager
 	METHOD a sendToNearbyPlayers (Laii;Lka;)V
 		ARG 1 entity
 		ARG 2 packet
-	METHOD a getDebugString (Lbgu;)Ljava/lang/String;
-		ARG 1 pos
 	METHOD a isMissingForLevel (Lur;I)Z
 		ARG 1 holder
 		ARG 2 maxLevel
@@ -38,6 +36,8 @@ CLASS ve net/minecraft/server/world/ServerChunkManager
 		ARG 4 create
 	METHOD b unloadEntity (Laii;)V
 	METHOD b sendToOtherNearbyPlayers (Laii;Lka;)V
+	METHOD b getDebugString (Lbgu;)Ljava/lang/String;
+		ARG 1 pos
 	METHOD b markForUpdate (Lev;)V
 	METHOD b removeTicket (Lvl;Lbgu;ILjava/lang/Object;)V
 	METHOD c applyViewDistance (II)V
diff --git a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping
index 441da82d23..4c716ca745 100644
--- a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping
+++ b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping
@@ -2,9 +2,9 @@ CLASS bhv net/minecraft/server/world/ServerTickScheduler
 	FIELD a invalidObjPredicate Ljava/util/function/Predicate;
 	FIELD b idToName Ljava/util/function/Function;
 	FIELD d ticksScheduled Ljava/util/Set;
-	FIELD g world Lvg;
-	FIELD h ticksCurrent Ljava/util/List;
-	FIELD i tickConsumer Ljava/util/function/Consumer;
+	FIELD h world Lvg;
+	FIELD i ticksCurrent Ljava/util/List;
+	FIELD j tickConsumer Ljava/util/function/Consumer;
 	METHOD <init> (Lvg;Ljava/util/function/Predicate;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/function/Consumer;)V
 		ARG 1 world
 		ARG 2 invalidObjPredicate