Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 18:45:54 +01:00
Code Issues Projects Releases Wiki Activity

Pull the last upstream updates

Browse Source
This commit is contained in:
Aikar 2018-08-31 11:51:41 -04:00
parent cd5da239f8
commit 2ae60bd203
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0168-Cache-user-authenticator-threads.patch
View File

@ -1,11 +1,11 @@
From 9f3a20649274a2ecc29be930cb9257172ce21902 Mon Sep 17 00:00:00 2001
From 69f4d5d935ffe8c523c7700bf7a41176cb0bea32 Mon Sep 17 00:00:00 2001
From: vemacs <d@nkmem.es>
Date: Wed, 23 Nov 2016 08:31:45 -0500
Subject: [PATCH] Cache user authenticator threads
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index 57f728567..2158fcd32 100644
index 2619adde2..8d1555a21 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -96,6 +96,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@ -32,7 +32,7 @@ index 57f728567..2158fcd32 100644
@Override
public void run() {
try {
@@ -191,7 +197,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -190,7 +196,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
server.server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + i.getName(), ex);
}
}
@ -42,7 +42,7 @@ index 57f728567..2158fcd32 100644
// Spigot end
}
@@ -207,7 +214,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -206,7 +213,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
this.loginKey = packetlogininencryptionbegin.a(privatekey);
this.g = LoginListener.EnumProtocolState.AUTHENTICATING;
this.networkManager.a(this.loginKey);
@ -52,7 +52,7 @@ index 57f728567..2158fcd32 100644
public void run() {
GameProfile gameprofile = LoginListener.this.i;
@@ -254,7 +262,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -253,7 +261,8 @@ public class LoginListener implements PacketLoginInListener, ITickable {
return LoginListener.this.server.ac() && socketaddress instanceof InetSocketAddress ? ((InetSocketAddress) socketaddress).getAddress() : null;
}

6
Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch
View File

@ -1,4 +1,4 @@
From abc6db5a95b3549c1203ace470c1e17cbb4a9ea3 Mon Sep 17 00:00:00 2001
From cb9274abfa6881022b706cd57bd0a5353b84c431 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 17 Aug 2017 16:08:20 -0700
Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@ -27,10 +27,10 @@ index dbafef023..ec89ecfca 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index c5434e6ba..75df92836 100644
index c9533c181..1a67196b4 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -250,6 +250,10 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -249,6 +249,10 @@ public class LoginListener implements PacketLoginInListener, ITickable {
LoginListener.this.i = LoginListener.this.a(gameprofile);
LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
} else {

6
Spigot-Server-Patches/0277-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
View File

@ -1,4 +1,4 @@
From 817b481e30e24f5323278304bde07985a9d5adf2 Mon Sep 17 00:00:00 2001
From 434b8d15661860eeea9d8c73e3f8675398307a7a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 18 Mar 2018 11:45:57 -0400
Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
This will allow you to change the players name or skin on login.
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index eaac25dc3..2842956bf 100644
index b1ab83648..26a366375 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -1,5 +1,7 @@
@ -25,7 +25,7 @@ index eaac25dc3..2842956bf 100644
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
import org.bukkit.event.player.PlayerPreLoginEvent;
@@ -290,8 +293,16 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -289,8 +292,16 @@ public class LoginListener implements PacketLoginInListener, ITickable {
java.util.UUID uniqueId = i.getId();
final org.bukkit.craftbukkit.CraftServer server = LoginListener.this.server.server;

6
Spigot-Server-Patches/0279-Player.setPlayerProfile-API.patch
View File

@ -1,4 +1,4 @@
From 4af3e524620c76a07efafb4d4053e55cd4190fa4 Mon Sep 17 00:00:00 2001
From 8c5f918fb22bd2d372155757c81cd7221fc81ed9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 18 Mar 2018 12:29:48 -0400
Subject: [PATCH] Player.setPlayerProfile API
@ -19,7 +19,7 @@ index 4b82e43a8..35fde8b23 100644
private final ItemCooldown bW;
@Nullable
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index 2842956bf..8aeded425 100644
index 26a366375..be43d9292 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -41,7 +41,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@ -31,7 +31,7 @@ index 2842956bf..8aeded425 100644
private final String j;
private SecretKey loginKey;
private EntityPlayer l;
@@ -294,12 +294,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -293,12 +293,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
final org.bukkit.craftbukkit.CraftServer server = LoginListener.this.server.server;
// Paper start

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 57ab4cfc6f4ff526d44319d9b8c79f6848db2de7
Subproject commit 2b93d839ddb1541cad937e3dd7a4da5d1525af3d

2
work/Spigot

@ -1 +1 @@
Subproject commit 642f6d2288b830f41347e8c0a162fbc0584e1579
Subproject commit 2cf50f055260acaa2344390334bbca546d46726d