Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-06 10:49:40 +01:00
Code Issues Projects Releases Wiki Activity

Upstream merge

Browse Source
This commit is contained in:
md_5 2013-09-21 13:39:32 +10:00
parent b097614299
commit fb8af9e2bb
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CraftBukkit

@ -1 +1 @@
Subproject commit 317b76b3f614d9ea8e1b93b86e9a53ceefd00804
Subproject commit 9532cb6ba0d6be1d50839910cabd38fc7d2a8eb1

8
CraftBukkit-Patches/0024-Netty.patch
View File

@ -1,4 +1,4 @@
From 45291669fd55e2a6d13274ec194ba9d7454385f3 Mon Sep 17 00:00:00 2001
From d4c1e16d482be2abb1bf40a1afeb6f958fca4b84 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 09:06:29 +1000
Subject: [PATCH] Netty
@ -100,7 +100,7 @@ index a2bdfa3..fd6acab 100644
+ public void setSocketAddress(SocketAddress address) { k = address; } // Spigot
}
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index 1bb77a9..f48d4a9 100644
index 2a96168..6ffc927 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -16,7 +16,7 @@ public class PendingConnection extends Connection {
@ -129,7 +129,7 @@ index 1bb77a9..f48d4a9 100644
}
// CraftBukkit start
@@ -147,7 +152,7 @@ public class PendingConnection extends Connection {
@@ -148,7 +153,7 @@ public class PendingConnection extends Connection {
String s = null;
// CraftBukkit
org.bukkit.event.server.ServerListPingEvent pingEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callServerListPingEvent(this.server.server, getSocket().getInetAddress(), this.server.getMotd(), playerlist.getPlayerCount(), playerlist.getMaxPlayers());
@ -138,7 +138,7 @@ index 1bb77a9..f48d4a9 100644
// CraftBukkit
s = pingEvent.getMotd() + "\u00A7" + playerlist.getPlayerCount() + "\u00A7" + pingEvent.getMaxPlayers();
} else {
@@ -176,9 +181,18 @@ public class PendingConnection extends Connection {
@@ -177,9 +182,18 @@ public class PendingConnection extends Connection {
this.networkManager.queue(new Packet255KickDisconnect(s));
this.networkManager.d();

6
CraftBukkit-Patches/0029-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From a00b57c3f0b5e97e36616d767febdcb7011a064f Mon Sep 17 00:00:00 2001
From 79f9e280ee27db93df6aa9911cd3fa09f9e93c0b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 11:15:11 +1100
Subject: [PATCH] BungeeCord Support
@ -6,10 +6,10 @@ Subject: [PATCH] BungeeCord Support
- Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin.
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index f48d4a9..9080831 100644
index 6ffc927..8f1c214 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -235,4 +235,17 @@ public class PendingConnection extends Connection {
@@ -236,4 +236,17 @@ public class PendingConnection extends Connection {
static boolean a(PendingConnection pendingconnection, boolean flag) {
return pendingconnection.h = flag;
}

7
CraftBukkit-Patches/0032-Filter-Invalid-Names.patch
View File

@ -1,14 +1,14 @@
From 1df832542a0945bd61df1795a36fb891a537d31c Mon Sep 17 00:00:00 2001
From af158b963d4d6ed7fd45b5dd918ce3364ec07f7c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 25 Jul 2013 17:06:02 +1000
Subject: [PATCH] Filter Invalid Names
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index 9080831..3be39d7 100644
index 8f1c214..d83d475 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -66,12 +66,13 @@ public class PendingConnection extends Connection {
@@ -66,13 +66,14 @@ public class PendingConnection extends Connection {
}
}
@ -17,6 +17,7 @@ index 9080831..3be39d7 100644
if (this.g != null) {
this.disconnect("Quit repeating yourself!");
} else {
this.hostname = packet2handshake.c + ':' + packet2handshake.d; // CraftBukkit - initialize field
this.g = packet2handshake.f();
- if (!this.g.equals(StripColor.a(this.g))) {
+ if (!this.g.equals(StripColor.a(this.g)) || !validName.matcher( this.g ).matches() ) { // Spigot

6
CraftBukkit-Patches/0049-Configurable-Messages.patch
View File

@ -1,14 +1,14 @@
From 4663f1e6e86fdf04862f8a470e2bed8b3382d672 Mon Sep 17 00:00:00 2001
From 3038b2cfba13c9f0bad651f6097d123ab7b02da7 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index 3be39d7..a30717a 100644
index d83d475..2b1df38 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -79,9 +79,9 @@ public class PendingConnection extends Connection {
@@ -80,9 +80,9 @@ public class PendingConnection extends Connection {
if (packet2handshake.d() != 78) {
if (packet2handshake.d() > 78) {

6
CraftBukkit-Patches/0053-Always-Fire-PreLoginEvent.patch
View File

@ -1,14 +1,14 @@
From d964dd9ec685eddd8bda68260b57ef12d2c2b1be Mon Sep 17 00:00:00 2001
From edf843cfae42c688f7003f0aeb4aacd081d0ac0a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 25 Jun 2013 18:09:26 +1000
Subject: [PATCH] Always Fire PreLoginEvent
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index a30717a..b098745 100644
index 2b1df38..358cba4 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -112,7 +112,7 @@ public class PendingConnection extends Connection {
@@ -113,7 +113,7 @@ public class PendingConnection extends Connection {
}
this.j = true;