mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-23 13:09:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@39d3a03 Fix Player#chat for 1.19.3 (#8684)
PaperMC/Paper@aa9c200 Fix metrics reporting unknown paper version (#8683)
PaperMC/Paper@44dc5a4 Don't call lock check event if the block entity doesn't exist (#8687)
PaperMC/Paper@86ed0d5 ChatProcessor fixes (#8690)
PaperMC/Paper@f3eb2c7 Fix reobf issue in previous commit
PaperMC/Paper@cf31151 [ci skip] Fix readme badge (#8693)
This commit is contained in:
BillyGalbreath 2022-12-17 10:40:13 -06:00
parent 7062a32f8f
commit 07afb7204e
No known key found for this signature in database
GPG Key ID: 1968A5C4D57BB3FA
11 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.3-R0.1-SNAPSHOT
paperCommit = 262c08f64fd4cd055a6e0f1f9b866624f3a36b59
paperCommit = cf3115158c81b247cfa472429b5fc77d6050a050
org.gradle.caching = true
org.gradle.parallel = true

20
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@ -91,7 +91,7 @@ index 06bff37e4c1fddd3be6343049a66787c63fb420c..2cc44fbf8e5bd436b6d4e19f6c06b351
new TimingsExport(listeners, parent, history).start();
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index 7b1843e16745ca8db2244e17490d291401f22679..061716934ba0a1f01e4d85d664034f72b3c7a765 100644
index 4b002e8b75d117b726b0de274a76d3596fce015b..061716934ba0a1f01e4d85d664034f72b3c7a765 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -593,7 +593,7 @@ public class Metrics {
@ -103,11 +103,19 @@ index 7b1843e16745ca8db2244e17490d291401f22679..061716934ba0a1f01e4d85d664034f72
metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
String minecraftVersion = Bukkit.getVersion();
@@ -603,7 +603,7 @@ public class Metrics {
@@ -603,15 +603,7 @@ public class Metrics {
metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline"));
- metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"));
- final String paperVersion;
- final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion();
- if (implVersion != null) {
- final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
- paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash);
- } else {
- paperVersion = "unknown";
- }
- metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion));
+ metrics.addCustomChart(new Metrics.SimplePie("pufferfish_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"));
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
@ -1482,7 +1490,7 @@ index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..d03551e81e3ef37935cb1d963aba3df3
}
}
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
index dacb00c7cb2702ae8e9c6be61ca08e41bd6009e4..b5d4c53bf1046fa52da5398491258b94f1e0fcd0 100644
index d1a59c2af0557a816c094983ec60097fb4de060c..9cbc6e0350c982e7b7a58a32ab34ff2446c4fd1b 100644
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
@@ -209,7 +209,7 @@ public final class MCUtil {
@ -2118,7 +2126,7 @@ index e5cd4b7609243669c9d84ff8a4988c209e6101aa..4f3708f5f5dcb6af8225bda1cc9204a6
private String descriptionId;
@Nullable
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 9e075de3542bda8ae086c9ca68bcd00b16d565d0..d134e88ae9aa2bd0b2b51056bfcc37941c713002 100644
index 864ab97b7a6c62c376ca38dbbc65bc9406dfd62b..cde8e5a5c2bd3e0bb7359d2638ebc9b5ca7a531d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -3536,7 +3544,7 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 47df6f4268a63118da8187f4102c876bd37d1680..098b67e6ad74be7698713623ca7fae70f19ac6b3 100644
index 38e347b5e9911907235f794da87f56e1f26277ae..277e8a03ab270eabb6b8c31d0076f3310c91eef2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper

4
patches/server/0005-Purpur-client-support.patch
View File

@ -43,10 +43,10 @@ index aa23559719357f2678e3aa759d58ba4bde18bdd4..662c43401bf84a6de47986e66e1f83c4
try {
byte[] data = new byte[packet.data.readableBytes()];
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 52071101c16ae84f69f1a00857b4895f328f6edd..72501f09d42f73a108e96f519be4382ee4e3b230 100644
index 99bf1485ddecb5fc88850242e9c32850781c4b36..af9abcc1d46a5e88dd85f5b61d3d8cced87ecd11 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2998,4 +2998,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3003,4 +3003,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end

4
patches/server/0012-AFK-API.patch
View File

@ -218,7 +218,7 @@ index 3b959f42d958bf0f426853aee56753d6c455fcdb..d17abb283ea818244df0379d6b57fc63
if (range < 0.0D || d < range * range) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 72501f09d42f73a108e96f519be4382ee4e3b230..573d25a15bafce004d8b26c5e7dea3c5f1bf0f99 100644
index af9abcc1d46a5e88dd85f5b61d3d8cced87ecd11..09c88f1bb2d8c629350cb21b3801767295396ea0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -524,10 +524,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -238,7 +238,7 @@ index 72501f09d42f73a108e96f519be4382ee4e3b230..573d25a15bafce004d8b26c5e7dea3c5
for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
if (player.getBukkitEntity().canSee(this)) {
player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
@@ -3004,5 +3009,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3009,5 +3014,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean usesPurpurClient() {
return getHandle().purpurClient;
}

4
patches/server/0018-Player-invulnerabilities.patch
View File

@ -121,10 +121,10 @@ index e35e1bf28463d1f21f3610a31316e825c737b260..5efee586de46ba9d22cab6cbc1ec5912
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 573d25a15bafce004d8b26c5e7dea3c5f1bf0f99..3f08e9162ccb21661daa021d1c82e917ea089b7e 100644
index 09c88f1bb2d8c629350cb21b3801767295396ea0..f61a1326fa943b606de8f75a6b7f95b9e220047a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3024,5 +3024,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3029,5 +3029,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}

6
patches/server/0128-Add-EntityTeleportHinderedEvent.patch
View File

@ -78,7 +78,7 @@ index 95a6284026d17567deb7416abe2bc4d6975aaaf8..053ec306027a83cdd06d10197d47d7ed
blockEntity.teleportCooldown = 100;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 3ac836bd6fccf66771dc0141b9b6a25da9837211..09b997701f7ebd2d3a8abe90dcf933c0037a95e0 100644
index ba898640a8f693e8bae43281b170d3505154b273..39ae7bdac23601c567013799375bf32b96d4e1fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -572,6 +572,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -93,10 +93,10 @@ index 3ac836bd6fccf66771dc0141b9b6a25da9837211..09b997701f7ebd2d3a8abe90dcf933c0
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3f08e9162ccb21661daa021d1c82e917ea089b7e..9ca8dab9976838c22cd759ae67c6c0821734cf0d 100644
index f61a1326fa943b606de8f75a6b7f95b9e220047a..7448c124fd155d832c999f16b4ecdbfeec8c6119 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1267,6 +1267,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1268,6 +1268,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API

4
patches/server/0184-Flying-Fall-Damage-API.patch
View File

@ -26,10 +26,10 @@ index 9e8cdcf56586351abc69bd4884d1f5fd2209cc68..747e3c7abaae99e60273c75fc45a7a58
} else {
if (fallDistance >= 2.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9ca8dab9976838c22cd759ae67c6c0821734cf0d..6addde66b83defbcf450936a3a878225a1dfcc92 100644
index 7448c124fd155d832c999f16b4ecdbfeec8c6119..0e755918b978e708f9567171cd4473308bd50ebb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3043,5 +3043,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3048,5 +3048,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}

4
patches/server/0218-Extended-OfflinePlayer-API.patch
View File

@ -223,10 +223,10 @@ index 6d2ba650f53de8a460857f1846401a20b50cc43c..8ed695fd64feb3c2411ed46d9c326eb2
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6addde66b83defbcf450936a3a878225a1dfcc92..d09ccb8931e9e89fcfb045bfbd4f178282b8b263 100644
index 0e755918b978e708f9567171cd4473308bd50ebb..3dcc850f02aecb1535e0310d76ff37413cc348f4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2218,6 +2218,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2219,6 +2219,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}

4
patches/server/0285-Debug-Marker-API.patch
View File

@ -99,10 +99,10 @@ index fcc6ac180a74daffa173866be3dd97a3ad63ebd7..804f81c478c09a5b6d0b10a78dc2b7ae
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d09ccb8931e9e89fcfb045bfbd4f178282b8b263..61cc3f41a8ef8d3cfe15fe6e92fa9b4977a26c24 100644
index 3dcc850f02aecb1535e0310d76ff37413cc348f4..ef8c5b407072c16ec57cc92e14e5b2b2cec2c09c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3074,5 +3074,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3079,5 +3079,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean hasFlyingFallDamage() {
return getHandle().flyingFallDamage;
}

4
patches/server/0286-add-Player-showCreditScreen.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] add Player#showCreditScreen
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 61cc3f41a8ef8d3cfe15fe6e92fa9b4977a26c24..1e9e73762bea7c80ec732e9b7977b6908917c044 100644
index ef8c5b407072c16ec57cc92e14e5b2b2cec2c09c..b7fab4e46c5125359edb66990f31f94715601eb8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2606,6 +2606,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2607,6 +2607,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.DEMO_EVENT, ClientboundGameEventPacket.DEMO_PARAM_INTRO));
}

4
patches/server/0291-Add-death-screen-API.patch
View File

@ -30,10 +30,10 @@ index 53b75f5737a910ffc5448cd9a85eae57f9c1488f..ea95873dd034779e56a8b924cd27f937
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1e9e73762bea7c80ec732e9b7977b6908917c044..82697576db752e3dad908e389035ec66c728f0ec 100644
index b7fab4e46c5125359edb66990f31f94715601eb8..b0fab5197b07cc81828ddb41ad07ccba4e58ebe2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3124,5 +3124,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3129,5 +3129,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (this.getHandle().connection == null) return;
this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket(ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_CLEAR, new FriendlyByteBuf(io.netty.buffer.Unpooled.buffer())));
}