Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
2f0e0a6d Backport feature search improvement from 1.17 (Fixes #2312) (#4771)
b6d9d634 Add API for quit reason
  • Loading branch information
@BillyGalbreath
BillyGalbreath committed Nov 15, 2020
1 parent be5fcdd commit 519ac08
Show file tree
Hide file tree
Showing 17 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion Paper
Submodule Paper updated 3 files
+68 −0 Spigot-API-Patches/0235-Add-API-for-quit-reason.patch
+63 −0 Spigot-Server-Patches/0599-Add-API-for-quit-reason.patch
+97 −0 Spigot-Server-Patches/0600-Seed-based-feature-search.patch
2 changes: 1 addition & 1 deletion current-paper
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.16.4--11496f974814db1c814249f94b605bf82c25822b
1.16.4--5a228dbd8274d5fd6c98d1ab645ecd7772c0845b
36 changes: 18 additions & 18 deletions patches/server/0001-Tuinity-Server-Changes.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8372,10 +8372,10 @@ index fe0334b50..87cd6fb0c 100644
}

diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 59d47a9f7..f8921eb83 100644
index 976c44c8e..27c368bf1 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -524,6 +524,174 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -525,6 +525,174 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
}

Expand Down Expand Up @@ -9664,7 +9664,7 @@ index 1558c5f82..b92ca4a6d 100644
Vec3D vec3d = new Vec3D(((double) pathpoint.a + this.a.locX()) / 2.0D, ((double) pathpoint.b + this.a.locY()) / 2.0D, ((double) pathpoint.c + this.a.locZ()) / 2.0D);

diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 7a84ea411..eb6b81d88 100644
index 3ec8ba17d..7a2a8acea 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -27,6 +27,8 @@ import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -9716,7 +9716,7 @@ index 7a84ea411..eb6b81d88 100644
public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
this.h = enumprotocoldirection;
}
@@ -142,8 +177,63 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -145,8 +180,63 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
if (MinecraftServer.getServer().isDebugging()) throwable.printStackTrace(); // Spigot
}

Expand Down Expand Up @@ -9780,7 +9780,7 @@ index 7a84ea411..eb6b81d88 100644
try {
a(packet, this.packetListener);
} catch (CancelledPacketHandleException cancelledpackethandleexception) {
@@ -217,7 +307,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -220,7 +310,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
MCUtil.isMainThread() && packet.isReady() && this.packetQueue.isEmpty() &&
(packet.getExtraPackets() == null || packet.getExtraPackets().isEmpty())
))) {
Expand All @@ -9789,7 +9789,7 @@ index 7a84ea411..eb6b81d88 100644
return;
}
// write the packets to the queue, then flush - antixray hooks there already
@@ -243,6 +333,14 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -246,6 +336,14 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {

private void dispatchPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericFutureListener) { this.b(packet, genericFutureListener); } // Paper - OBFHELPER
private void b(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
Expand All @@ -9804,7 +9804,7 @@ index 7a84ea411..eb6b81d88 100644
EnumProtocol enumprotocol = EnumProtocol.a(packet);
EnumProtocol enumprotocol1 = (EnumProtocol) this.channel.attr(NetworkManager.c).get();

@@ -265,7 +363,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -268,7 +366,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
try {
// Paper end

Expand All @@ -9813,7 +9813,7 @@ index 7a84ea411..eb6b81d88 100644

if (genericfuturelistener != null) {
channelfuture.addListener(genericfuturelistener);
@@ -285,39 +383,83 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -288,39 +386,83 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
}
// Paper end
} else {
Expand Down Expand Up @@ -9927,7 +9927,7 @@ index 7a84ea411..eb6b81d88 100644
}

}
@@ -340,6 +482,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -343,6 +485,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
}
private boolean processQueue() {
if (this.packetQueue.isEmpty()) return true;
Expand All @@ -9936,7 +9936,7 @@ index 7a84ea411..eb6b81d88 100644
// If we are on main, we are safe here in that nothing else should be processing queue off main anymore
// But if we are not on main due to login/status, the parent is synchronized on packetQueue
java.util.Iterator<QueuedPacket> iterator = this.packetQueue.iterator();
@@ -347,16 +491,22 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -350,16 +494,22 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
NetworkManager.QueuedPacket queued = iterator.next(); // poll -> peek

// Fix NPE (Spigot bug caused by handleDisconnection())
Expand All @@ -9961,7 +9961,7 @@ index 7a84ea411..eb6b81d88 100644
}
}
return true;
@@ -433,10 +583,16 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -436,10 +586,16 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
return this.channel instanceof LocalChannel || this.channel instanceof LocalServerChannel;
}

Expand Down Expand Up @@ -11135,10 +11135,10 @@ index 6c399bcea..d3bf356ea 100644
}
// Paper end - optimised tracker
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 563ae7355..b89caa8ad 100644
index a736d676e..12ce5b106 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -415,7 +415,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -416,7 +416,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed *= 2f; // TODO: Get the speed of the vehicle instead of the player

// Paper start - Prevent moving into unloaded chunks
Expand All @@ -11149,7 +11149,7 @@ index 563ae7355..b89caa8ad 100644
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
return;
}
@@ -1054,7 +1056,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1055,7 +1057,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}

if (this.teleportPos != null) {
Expand All @@ -11158,7 +11158,7 @@ index 563ae7355..b89caa8ad 100644
this.A = this.e;
this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
}
@@ -1124,7 +1126,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1125,7 +1127,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed = player.abilities.walkSpeed * 10f;
}
// Paper start - Prevent moving into unloaded chunks
Expand All @@ -11167,15 +11167,15 @@ index 563ae7355..b89caa8ad 100644
this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
return;
}
@@ -1180,6 +1182,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1181,6 +1183,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}

this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
+ boolean didCollide = toX != this.player.locX() || toY != this.player.locY() || toZ != this.player.locZ(); // Tuinity - needed here as the difference in Y can be reset - also note: this is only a guess at whether collisions took place, floating point errors can make this true when it shouldn't be...
this.player.setOnGround(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
// Paper start - prevent position desync
if (this.teleportPos != null) {
@@ -1204,7 +1207,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1205,7 +1208,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}

this.player.setLocation(d4, d5, d6, f, f1);
Expand Down Expand Up @@ -13465,7 +13465,7 @@ index 5d9d58411..f0fdfd689 100644
private double c;

diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d64d94b8c..f7103ec2a 100644
index f260da1fd..6cb47160d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -94,6 +94,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
Expand Down
12 changes: 6 additions & 6 deletions patches/server/0009-AFK-API.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ index caaa01b20..335cb9c4a 100644
super(EntityTypes.PLAYER, world);
this.bL = ItemStack.b;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index f8921eb83..c7cf49897 100644
index 27c368bf1..694159cca 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1890,8 +1890,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1891,8 +1891,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

public void resetIdleTimer() {
this.ca = SystemUtils.getMonotonicMillis();
Expand Down Expand Up @@ -154,7 +154,7 @@ index 31eb6868c..9f9d9b2de 100644
// Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index b89caa8ad..4365d0bbb 100644
index 12ce5b106..13da04e5b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -247,6 +247,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
Expand All @@ -170,7 +170,7 @@ index b89caa8ad..4365d0bbb 100644
this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
this.disconnect(new ChatMessage("multiplayer.disconnect.idling"));
}
@@ -502,6 +508,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -503,6 +509,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();

Expand All @@ -179,7 +179,7 @@ index b89caa8ad..4365d0bbb 100644
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1203,7 +1211,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1204,7 +1212,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
flag1 = true;
Expand All @@ -188,7 +188,7 @@ index b89caa8ad..4365d0bbb 100644
}

this.player.setLocation(d4, d5, d6, f, f1);
@@ -1242,6 +1250,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1243,6 +1251,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();

Expand Down
18 changes: 9 additions & 9 deletions patches/server/0021-Player-invulnerabilities.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities


diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index c7cf49897..fd7099adc 100644
index 694159cca..ddef5d06f 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -147,6 +147,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -148,6 +148,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.canPickUpLoot = true;
this.maxHealthCache = this.getMaxHealth();
this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
Expand All @@ -17,7 +17,7 @@ index c7cf49897..fd7099adc 100644
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -977,6 +979,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -978,6 +980,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

}

Expand All @@ -30,7 +30,7 @@ index c7cf49897..fd7099adc 100644
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -984,7 +992,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -985,7 +993,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} else {
boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);

Expand All @@ -39,15 +39,15 @@ index c7cf49897..fd7099adc 100644
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1155,6 +1163,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1156,6 +1164,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
// CraftBukkit end
}

+ this.invulnerableTicks = worldserver.purpurConfig.playerSpawnInvulnerableTicks; // Purpur
return this;
}
}
@@ -2298,9 +2307,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2299,9 +2308,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

@Override
public boolean isFrozen() { // Paper - protected > public
Expand All @@ -67,10 +67,10 @@ index c7cf49897..fd7099adc 100644
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4365d0bbb..727975c26 100644
index 13da04e5b..11473f06b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1652,6 +1652,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1653,6 +1653,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
Expand All @@ -79,7 +79,7 @@ index 4365d0bbb..727975c26 100644
this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
// Paper end
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 38f26e25c..c92a703da 100644
index 1faefcb5d..9aa6998c6 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -905,6 +905,8 @@ public abstract class PlayerList {
Expand Down
8 changes: 4 additions & 4 deletions patches/server/0024-Alternative-Keepalive-Handling.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling


diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
index 8e93f1540b..470f92c4fb 100644
index 8e93f1540..470f92c4f 100644
--- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
+++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
@@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet<PacketListenerPlayIn> {
Expand All @@ -17,7 +17,7 @@ index 8e93f1540b..470f92c4fb 100644
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 727975c26b..294ce7b086 100644
index 11473f06b..32bfd0e22 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -83,6 +83,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
Expand Down Expand Up @@ -50,7 +50,7 @@ index 727975c26b..294ce7b086 100644
if (this.isPendingPing()) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
@@ -2818,6 +2834,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2819,6 +2835,16 @@ public class PlayerConnection implements PacketListenerPlayIn {

@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
Expand All @@ -68,7 +68,7 @@ index 727975c26b..294ce7b086 100644
if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 6ff5e07834..f1d6c32fde 100644
index 6ff5e0783..f1d6c32fd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -154,6 +154,11 @@ public class PurpurConfig {
Expand Down
8 changes: 4 additions & 4 deletions patches/server/0052-Signs-allow-color-codes.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes


diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 136012754..e917b302a 100644
index ddef5d06f..a2924ab61 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1247,6 +1247,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1416,6 +1416,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

@Override
public void openSign(TileEntitySign tileentitysign) {
Expand All @@ -17,10 +17,10 @@ index 136012754..e917b302a 100644
this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 294ce7b08..11ad2830f 100644
index 32bfd0e22..cf7540f23 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2815,6 +2815,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2816,6 +2816,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
// Paper end
Expand Down
Loading

0 comments on commit 519ac08

Please sign in to comment.