Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

[Auto] Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
310dc809 Add ServerLoadEvent

CraftBukkit Changes:
19d654bd Add ServerLoadEvent
This commit is contained in:
Aikar
2018-09-07 23:49:37 -04:00
parent 2571276390
commit d617f95f05
31 changed files with 188 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch
View File

@@ -1,4 +1,4 @@
From bab7db69e8d1867bdfbf4808929cbde2f8bd8190 Mon Sep 17 00:00:00 2001
From eb14bec3aaf4d58dcc435f072644624a86930288 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..350410527b
+
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 014c923897..76e6b233b1 100644
index 3e99221619..2e9836d8f9 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 014c923897..76e6b233b1 100644
import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -935,7 +936,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -939,7 +940,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
if (i - this.Y >= 5000000000L) {
this.Y = i;
this.m.setPlayerSample(new ServerPing.ServerPingPlayerSample(this.z(), this.y()));
@@ -197,7 +197,7 @@ index 014c923897..76e6b233b1 100644
int j = MathHelper.nextInt(this.n, 0, this.y() - agameprofile.length);
for (int k = 0; k < agameprofile.length; ++k) {
@@ -1292,10 +1293,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -1296,10 +1297,12 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
return "1.13.1";
}