Update upstream

This commit is contained in:
Spottedleaf
2019-05-06 17:33:26 -07:00
parent b5b481da62
commit bc024aec6e
23 changed files with 90 additions and 90 deletions

View File

@@ -1,4 +1,4 @@
From 2e14f427f05f592a27e0b7e4d149435d4f16fe93 Mon Sep 17 00:00:00 2001
From c64067e1e031f2feea4e8405a734618792f6c54c Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Wed, 11 Oct 2017 15:56:26 +0200
Subject: [PATCH] Implement extended PaperServerListPingEvent
@@ -177,7 +177,7 @@ index 0000000000..a85466bc7e
+
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 91eed567cb..d3620b18a0 100644
index c84af46815..ffa850077f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1,6 +1,7 @@
@@ -188,7 +188,7 @@ index 91eed567cb..d3620b18a0 100644
import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -1056,7 +1057,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1055,7 +1056,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
if (i - this.Z >= 5000000000L) {
this.Z = i;
this.serverPing.setPlayerSample(new ServerPing.ServerPingPlayerSample(this.getMaxPlayers(), this.getPlayerCount()));