fix FabricMC#373

hea3ven · Jan 9, 2019 · 15df307 · 15df307
1 parent 0906c04
commit 15df307
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -31,6 +31,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	FIELD af commandManager Lcb;
 	FIELD ag recipeManager Layx;
 	FIELD ah tagManager Lyg;
+	FIELD ai scoreboard Lqr;
 	FIELD ak lootManager Lcja;
 	FIELD al advancementManager Lqo;
 	FIELD am commandFunctionManager Lqp;
@@ -111,6 +112,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD aK getCommandManager ()Lcb;
 	METHOD aM getRecipeManager ()Layx;
 	METHOD aN getTagManager ()Lyg;
+	METHOD aO getScoreboard ()Lqr;
 	METHOD aP getLootManager ()Lcja;
 	METHOD aQ getGameRules ()Lbbl;
 	METHOD aT getTickTime ()F

diff --git a/mappings/net/minecraft/server/world/ServerTickScheduler.mapping b/mappings/net/minecraft/server/world/ServerTickScheduler.mapping
@@ -1,5 +1,5 @@
 CLASS bce net/minecraft/server/world/ServerTickScheduler
-	FIELD a shouldExclude Ljava/util/function/Predicate;
+	FIELD a invalidObjPredicate Ljava/util/function/Predicate;
 	FIELD b idToName Ljava/util/function/Function;
 	FIELD c nameToId Ljava/util/function/Function;
 	FIELD d ticksScheduled Ljava/util/Set;
@@ -9,7 +9,7 @@ CLASS bce net/minecraft/server/world/ServerTickScheduler
 	FIELD h tickConsumer Ljava/util/function/Consumer;
 	METHOD <init> (Luq;Ljava/util/function/Predicate;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/function/Consumer;)V
 		ARG 1 world
-		ARG 2 shouldExclude
+		ARG 2 invalidObjPredicate
 		ARG 3 idToName
 		ARG 4 nameToId
 		ARG 5 tickConsumer

diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping
@@ -46,6 +46,7 @@ CLASS uq net/minecraft/server/world/ServerWorld
 	METHOD i_ initialize ()Luq;
 	METHOD k_ updateSleepingStatus ()V
 	METHOD l setDefaultSpawnClient ()V
+	METHOD l_ getScoreboard ()Lqr;
 	METHOD m_ updateEntities ()V
 	METHOD p tickScheduledTicks ()V
 	METHOD r getForcedSpawnPoint ()Let;