spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2022-10-28 20:22:52 +11:00
parent 89741d3e9f
commit 1aec3fc149
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
6 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CraftBukkit-Patches/0019-Configurable-Messages.patch
View file

@ -1,14 +1,14 @@
From 37d52bc08ed95d4c53f04199e90b924f912055d1 Mon Sep 17 00:00:00 2001
From cd5c1d89158cb4a6d4a18687b72197c5be8fc507 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/network/HandshakeListener.java b/src/main/java/net/minecraft/server/network/HandshakeListener.java
index fa7cf0ea9..190fb0006 100644
index ccdb4e80b..8da1aaa0a 100644
--- a/src/main/java/net/minecraft/server/network/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/network/HandshakeListener.java
@@ -73,9 +73,9 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -74,9 +74,9 @@ public class HandshakeListener implements PacketHandshakingInListener {
IChatMutableComponent ichatmutablecomponent;
if (packethandshakinginsetprotocol.getProtocolVersion() < 754) {
@ -21,7 +21,7 @@ index fa7cf0ea9..190fb0006 100644
this.connection.send(new PacketLoginOutDisconnect(ichatmutablecomponent));
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 4165c93a0..fa218ef37 100644
index 38205df73..be97edeab 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -585,7 +585,7 @@ public abstract class PlayerList {

12
CraftBukkit-Patches/0029-Fire-PreLogin-Events-in-Offline-Mode.patch
View file

@ -1,14 +1,14 @@
From 0ea04701784a9fa13952f745a2ce0fbfd1a25c0d Mon Sep 17 00:00:00 2001
From eced1b57e0243a70f2310179b216f29a18cff600 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:32:10 +1100
Subject: [PATCH] Fire PreLogin Events in Offline Mode
diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
index 506bf435d..e5b0edcf1 100644
index fe3c5aebd..b4e609b8c 100644
--- a/src/main/java/net/minecraft/server/network/LoginListener.java
+++ b/src/main/java/net/minecraft/server/network/LoginListener.java
@@ -118,11 +118,18 @@ public class LoginListener implements TickablePacketListener, PacketLoginInListe
@@ -117,11 +117,18 @@ public class LoginListener implements TickablePacketListener, PacketLoginInListe
}
@ -29,7 +29,7 @@ index 506bf435d..e5b0edcf1 100644
} else {
try {
SignatureValidator signaturevalidator = this.server.getServiceSignatureValidator();
@@ -216,7 +223,21 @@ public class LoginListener implements TickablePacketListener, PacketLoginInListe
@@ -215,7 +222,21 @@ public class LoginListener implements TickablePacketListener, PacketLoginInListe
this.state = LoginListener.EnumProtocolState.KEY;
this.connection.send(new PacketLoginOutEncryptionBegin("", this.server.getKeyPair().getPublic().getEncoded(), this.nonce));
} else {
@ -52,7 +52,7 @@ index 506bf435d..e5b0edcf1 100644
}
}
@@ -270,40 +291,7 @@ public class LoginListener implements TickablePacketListener, PacketLoginInListe
@@ -269,40 +290,7 @@ public class LoginListener implements TickablePacketListener, PacketLoginInListe
return;
}
@ -94,7 +94,7 @@ index 506bf435d..e5b0edcf1 100644
} else if (LoginListener.this.server.isSingleplayer()) {
LoginListener.LOGGER.warn("Failed to verify username but will let them in anyway!");
LoginListener.this.gameProfile = gameprofile;
@@ -342,7 +330,48 @@ public class LoginListener implements TickablePacketListener, PacketLoginInListe
@@ -341,7 +329,48 @@ public class LoginListener implements TickablePacketListener, PacketLoginInListe
thread.start();
}

22
CraftBukkit-Patches/0030-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From 17d1a67586cb4954b6e20cec59be15fbc4249f14 Mon Sep 17 00:00:00 2001
From 30e4fc8ca3d4ee7418e920abb53dbf9015d72b56 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support
Provides support for IP forwarding via BungeeCord.
diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
index 7326aacaf..a5a81082f 100644
index 82c2a9de9..564bf6df3 100644
--- a/src/main/java/net/minecraft/network/NetworkManager.java
+++ b/src/main/java/net/minecraft/network/NetworkManager.java
@@ -74,6 +74,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -20,7 +20,7 @@ index 7326aacaf..a5a81082f 100644
private PacketListener packetListener;
private IChatBaseComponent disconnectedReason;
private boolean encrypted;
@@ -436,4 +440,11 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -437,4 +441,11 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
this.listener = packetsendlistener;
}
}
@ -46,7 +46,7 @@ index e992a972d..786314a9b 100644
this.intention = EnumProtocol.getById(packetdataserializer.readVarInt());
}
diff --git a/src/main/java/net/minecraft/server/network/HandshakeListener.java b/src/main/java/net/minecraft/server/network/HandshakeListener.java
index 190fb0006..a107fa07d 100644
index 8da1aaa0a..8e0033e7f 100644
--- a/src/main/java/net/minecraft/server/network/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/network/HandshakeListener.java
@@ -17,6 +17,11 @@ import java.util.HashMap;
@ -61,7 +61,7 @@ index 190fb0006..a107fa07d 100644
// CraftBukkit start - add fields
private static final HashMap<InetAddress, Long> throttleTracker = new HashMap<InetAddress, Long>();
private static int throttleCounter = 0;
@@ -82,6 +87,31 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -83,6 +88,31 @@ public class HandshakeListener implements PacketHandshakingInListener {
this.connection.disconnect(ichatmutablecomponent);
} else {
this.connection.setListener(new LoginListener(this.server, this.connection));
@ -90,14 +90,14 @@ index 190fb0006..a107fa07d 100644
+ return;
+ }
+ // Spigot End
((LoginListener) this.connection.getPacketListener()).hostname = packethandshakinginsetprotocol.hostName + ":" + packethandshakinginsetprotocol.port; // CraftBukkit - set hostname
}
break;
case STATUS:
diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
index e5b0edcf1..f2e256d89 100644
index b4e609b8c..35dc939c7 100644
--- a/src/main/java/net/minecraft/server/network/LoginListener.java
+++ b/src/main/java/net/minecraft/server/network/LoginListener.java
@@ -121,7 +121,25 @@ public class LoginListener implements TickablePacketListener, PacketLoginInListe
@@ -120,7 +120,25 @@ public class LoginListener implements TickablePacketListener, PacketLoginInListe
// Spigot start
public void initUUID()
{
@ -155,15 +155,15 @@ index 919fecf3a..8a1225af5 100644
return;
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 81da9f01f..ab0d3d629 100644
index 61dd77cba..3a66e8ce4 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -571,7 +571,7 @@ public abstract class PlayerList {
EntityPlayer entity = new EntityPlayer(this.server, this.server.getLevel(World.OVERWORLD), gameprofile, profilepublickey);
Player player = entity.getBukkitEntity();
- PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress());
+ PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.connection.getRawAddress()).getAddress());
- PlayerLoginEvent event = new PlayerLoginEvent(player, loginlistener.connection.hostname, ((java.net.InetSocketAddress) socketaddress).getAddress());
+ PlayerLoginEvent event = new PlayerLoginEvent(player, loginlistener.connection.hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.connection.getRawAddress()).getAddress());
if (getBans().isBanned(gameprofile) && !getBans().get(gameprofile).hasExpired()) {
GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.bans.get(gameprofile);

6
CraftBukkit-Patches/0053-Print-Stack-on-InternalException.patch
View file

@ -1,14 +1,14 @@
From e464f9e0fbc1aec427bb6427e63b616ac5edf350 Mon Sep 17 00:00:00 2001
From 5fcf8ec87de71f9e6c9613db787c86ec3af66138 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 13 Apr 2014 09:00:59 +1000
Subject: [PATCH] Print Stack on InternalException
diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
index a5a81082f..db741c1f4 100644
index 564bf6df3..0d52ca9dc 100644
--- a/src/main/java/net/minecraft/network/NetworkManager.java
+++ b/src/main/java/net/minecraft/network/NetworkManager.java
@@ -147,6 +147,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -148,6 +148,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
}
}

8
CraftBukkit-Patches/0058-Fix-race-condition-that-could-kill-connections-befor.patch
View file

@ -1,4 +1,4 @@
From 500dce26482738d42e9880b0dc8a87656977a3e1 Mon Sep 17 00:00:00 2001
From f004d66c6d55d918fe6beef411361d9421db76d9 Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Fri, 25 Apr 2014 23:46:46 +0200
Subject: [PATCH] Fix race condition that could kill connections before they
@ -12,7 +12,7 @@ initialized. The ServerConnection does not remove NetworkManagers with
this flag.
diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
index db741c1f4..a1307551b 100644
index 0d52ca9dc..0d2296550 100644
--- a/src/main/java/net/minecraft/network/NetworkManager.java
+++ b/src/main/java/net/minecraft/network/NetworkManager.java
@@ -77,6 +77,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -23,7 +23,7 @@ index db741c1f4..a1307551b 100644
// Spigot End
private PacketListener packetListener;
private IChatBaseComponent disconnectedReason;
@@ -97,6 +98,9 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -98,6 +99,9 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
super.channelActive(channelhandlercontext);
this.channel = channelhandlercontext.channel();
this.address = this.channel.remoteAddress();
@ -33,7 +33,7 @@ index db741c1f4..a1307551b 100644
try {
this.setProtocol(EnumProtocol.HANDSHAKING);
@@ -293,6 +297,9 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -294,6 +298,9 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
}
public void disconnect(IChatBaseComponent ichatbasecomponent) {

6
CraftBukkit-Patches/0082-Clear-Packet-Queue-on-Disconnect.patch
View file

@ -1,14 +1,14 @@
From ce674676edf82c458b283b0d158105186b5d78ec Mon Sep 17 00:00:00 2001
From 7c158e74db7984f123907458264446c761b3faa8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 22 Jul 2015 19:04:37 +1000
Subject: [PATCH] Clear Packet Queue on Disconnect
diff --git a/src/main/java/net/minecraft/network/NetworkManager.java b/src/main/java/net/minecraft/network/NetworkManager.java
index a1307551b..644709aaa 100644
index 0d2296550..05d79ded3 100644
--- a/src/main/java/net/minecraft/network/NetworkManager.java
+++ b/src/main/java/net/minecraft/network/NetworkManager.java
@@ -424,6 +424,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -425,6 +425,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
} else if (this.getPacketListener() != null) {
this.getPacketListener().onDisconnect(IChatBaseComponent.translatable("multiplayer.disconnect.generic"));
}