Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b91d964b1 Restore Pathfinder Optimizations from 1.15.2
adadf1654 Drop syncPosition on teleportation patch
This commit is contained in:
William Blake Galbreath
2020-08-06 23:44:17 -05:00
parent d6d9539cd2
commit a55a51bf42
10 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 6f66fa5714...b91d964b17

2
current-paper
View File

@@ -1 +1 @@
1.16.1--e2ec806ca4dcf4854e569776c890609c89ca46c1
1.16.1--e1ae5fab6252c559a3b7dc55d054cf9e556465ff

14
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -4241,7 +4241,7 @@ index 03a79ff992..d59ef07e1c 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 84b9c31cc1..82a5658425 100644
index 6259ff4a57..ddb56ffd2b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -322,19 +322,24 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -4287,7 +4287,7 @@ index 84b9c31cc1..82a5658425 100644
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
return;
}
@@ -976,7 +983,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -975,7 +982,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (this.teleportPos != null) {
@@ -4296,7 +4296,7 @@ index 84b9c31cc1..82a5658425 100644
this.A = this.e;
this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
}
@@ -1000,7 +1007,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -999,7 +1006,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
double d2 = this.player.locZ();
double d3 = this.player.locY();
double d4 = packetplayinflying.a(this.player.locX());double toX = d4; // Paper - OBFHELPER
@@ -4305,7 +4305,7 @@ index 84b9c31cc1..82a5658425 100644
double d6 = packetplayinflying.c(this.player.locZ());double toZ = d6; // Paper - OBFHELPER
float f = packetplayinflying.a(this.player.yaw);
float f1 = packetplayinflying.b(this.player.pitch);
@@ -1008,7 +1015,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1007,7 +1014,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
double d8 = d5 - this.m;
double d9 = d6 - this.n;
double d10 = this.player.getMot().g();
@@ -4319,7 +4319,7 @@ index 84b9c31cc1..82a5658425 100644
if (this.player.isSleeping()) {
if (d11 > 1.0D) {
@@ -1041,7 +1053,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1040,7 +1052,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed = player.abilities.walkSpeed * 10f;
}
// Paper start - Prevent moving into unloaded chunks
@@ -4328,7 +4328,7 @@ index 84b9c31cc1..82a5658425 100644
this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
return;
}
@@ -1097,6 +1109,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1096,6 +1108,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -4336,7 +4336,7 @@ index 84b9c31cc1..82a5658425 100644
this.player.c(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
// Paper start - prevent position desync
if (this.teleportPos != null) {
@@ -1121,7 +1134,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1120,7 +1133,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.setLocation(d4, d5, d6, f, f1);

16
patches/server/0009-AFK-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3db19a9bab..ebbd81a2db 100644
index db62601ea7..08f43f7992 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1563,6 +1563,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,7 +17,7 @@ index 3db19a9bab..ebbd81a2db 100644
double d3 = this.locX() - d0;
double d4 = this.locY() - d1;
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 2cada09ced..a69a698594 100644
index e411f6280d..7ac4ce116e 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -84,6 +84,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -37,7 +37,7 @@ index 2cada09ced..a69a698594 100644
super(EntityTypes.PLAYER, world);
this.bS = ItemStack.b;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 4550e3449b..a00993e328 100644
index e5a81f8318..ecd0cd7752 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1752,8 +1752,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -161,7 +161,7 @@ index a52dd0c021..9b4795f3bd 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 bf603ba34f..8b70ccb604 100644
index ddb56ffd2b..b28bdaabbe 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -232,6 +232,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -186,7 +186,7 @@ index bf603ba34f..8b70ccb604 100644
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1130,7 +1138,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1129,7 +1137,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;
@@ -195,7 +195,7 @@ index bf603ba34f..8b70ccb604 100644
}
this.player.setLocation(d4, d5, d6, f, f1);
@@ -1169,6 +1177,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1168,6 +1176,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -275,7 +275,7 @@ index 361f7857e4..2578a4677d 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 72cd52fd7f..41184219ee 100644
index adf918fd75..b202fb8e14 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2155,4 +2155,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -301,7 +301,7 @@ index 72cd52fd7f..41184219ee 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index f78e44e05f..da4c49daf4 100644
index 37e930e0cb..89dc611cd7 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -207,6 +207,7 @@ public class ActivationRange

12
patches/server/0025-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ 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 a00993e32..23c41684b 100644
index ecd0cd7752..2ff7e6e576 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -141,6 +141,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -67,10 +67,10 @@ index a00993e32..23c41684b 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 1e61b179f..dd55667d2 100644
index b28bdaabbe..9cbf3e63ea 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1580,6 +1580,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1578,6 +1578,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -79,7 +79,7 @@ index 1e61b179f..dd55667d2 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 9382e8f79..7309d8be2 100644
index 9382e8f79e..7309d8be28 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -890,6 +890,8 @@ public abstract class PlayerList {
@@ -92,7 +92,7 @@ index 9382e8f79..7309d8be2 100644
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2578a4677..c441fcea9 100644
index 2578a4677d..c441fcea9b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -67,4 +67,11 @@ public class PurpurWorldConfig {
@@ -108,7 +108,7 @@ index 2578a4677..c441fcea9 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 41184219e..627c5bd04 100644
index b202fb8e14..3732b82bf2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2171,5 +2171,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

8
patches/server/0028-Alternative-Keepalive-Handling.patch
View File

@@ -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 8e93f1540..470f92c4f 100644
index 8e93f1540b..470f92c4fb 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> {
@@ -17,7 +17,7 @@ index 8e93f1540..470f92c4f 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 dd55667d2..6173eb97d 100644
index 9cbf3e63ea..4cd07ab08a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -50,7 +50,7 @@ index dd55667d2..6173eb97d 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
@@ -2721,6 +2737,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2719,6 +2735,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -68,7 +68,7 @@ index dd55667d2..6173eb97d 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 6ff5e0783..f1d6c32fd 100644
index 6ff5e07834..f1d6c32fde 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 {

10
patches/server/0056-Signs-allow-color-codes.patch
View File

@@ -5,7 +5,7 @@ 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 23c41684b..546ac194a 100644
index 2ff7e6e576..34e7415a8c 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1269,6 +1269,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,10 +17,10 @@ index 23c41684b..546ac194a 100644
public int nextContainerCounter() { // CraftBukkit - void -> int
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6173eb97d..c518d4346 100644
index 4cd07ab08a..5d31b56184 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2718,6 +2718,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2716,6 +2716,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
// Paper end
@@ -36,7 +36,7 @@ index 6173eb97d..c518d4346 100644
}
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index e1ab29975..1778c5474 100644
index e1ab299756..1778c5474f 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -1,6 +1,14 @@
@@ -77,7 +77,7 @@ index e1ab29975..1778c5474 100644
@Override
public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 227436226..21a2c0c43 100644
index 227436226c..21a2c0c434 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -102,9 +102,12 @@ public class PurpurWorldConfig {

8
patches/server/0103-ALlow-color-codes-in-books.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] ALlow color codes in books
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index c518d4346..194256e51 100644
index 5d31b56184..0f1b0065d6 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -940,12 +940,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -939,12 +939,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
itemstack2.setTag(nbttagcompound.clone());
}
@@ -24,7 +24,7 @@ index c518d4346..194256e51 100644
ChatComponentText chatcomponenttext = new ChatComponentText(s);
s = IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) chatcomponenttext);
@@ -957,7 +958,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -956,7 +957,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
} else {
// Paper start - dont mutate players current item, set it from the event
ItemStack newBook = itemstack1.cloneItemStack();
@@ -40,7 +40,7 @@ index c518d4346..194256e51 100644
this.player.setSlot(enumitemslot, CraftEventFactory.handleEditBookEvent(player, enumitemslot, itemstack1, newBook));
// Paper end
}
@@ -967,6 +975,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -966,6 +974,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}

4
patches/server/0104-Entity-lifespan.patch
View File

@@ -92,10 +92,10 @@ index 2a60f08530..e276a59203 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f3694b065f..786ffacb2d 100644
index 0f1b0065d6..194bb355ca 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2135,6 +2135,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2133,6 +2133,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient;
Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem();
PlayerInteractEntityEvent event;

6
patches/server/0115-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 786ffacb2d..09d66c218f 100644
index 194bb355ca..9cadf0c32e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1895,7 +1895,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1893,7 +1893,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
return null;
}
@@ -26,7 +26,7 @@ index 786ffacb2d..09d66c218f 100644
PlayerConnection.this.minecraftServer.console.sendMessage(message);
if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) {
@@ -1928,7 +1936,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1926,7 +1934,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
// Paper Start - (Meh) Support for vanilla world scoreboard name coloring
String displayName = event.getPlayer().getDisplayName();
if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) {