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 appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@14add2b Updated Upstream (CraftBukkit)
PaperMC/Paper@178802a Fix various 1.18.2 update issues (#7523)
This commit is contained in:
BillyGalbreath
2022-03-01 18:45:42 -06:00
parent 90adb4e4af
commit 2dc2d2c369
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -4,7 +4,7 @@ version = 1.18.2-R0.1-SNAPSHOT
mcVersion = 1.18.2
packageVersion = 1_18_R1
paperCommit = 0859f594698246d3999ea9829393bc90cf783088
paperCommit = 178802ab94714d68c0833f53fbc9de0764ab0f8b
org.gradle.caching = true
org.gradle.parallel = true

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

@@ -2134,7 +2134,7 @@ index 7bddc7517356cc74104dcc5c7c55522a53f2596f..d6a57cdad2c92521a800cb18d060d9d6
public static long getCoordinateKey(final ChunkPos pair) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0a0bc8c45cb70073cb94dee25b5e54fb98bf9c8e..b53fa61dc542937641c36d90c6613e072a05ec5f 100644
index 3a9c27ece0ad18b2c4686164766794c56fcea268..9bd03a9ca4d1a5332738b943493c2b7bb339b698 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -310,6 +310,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2155,7 +2155,7 @@ index 0a0bc8c45cb70073cb94dee25b5e54fb98bf9c8e..b53fa61dc542937641c36d90c6613e07
}
public SystemReport fillSystemReport(SystemReport details) {
@@ -2238,6 +2240,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2243,6 +2245,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@@ -2353,7 +2353,7 @@ index 1092ba200a945d8d70e48f956535f56e2743302d..937a93d134dc986fe23e5676d58f7619
this.wasOnGround = this.entity.isOnGround();
this.teleportDelay = 0;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 8e87aca16879d7dd1dc0bd17d3215fca40b547cd..a154761eecb4911f8b646cccbb9b713e0fcc693e 100644
index b5b56d4549e97abbbe9e91d881b9bca8428f1eec..ce0787be675a1dedec626ae25ffd5bf5ff6a7d69 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -670,7 +670,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -4171,7 +4171,7 @@ index 909b2c98e7a9117d2f737245e4661792ffafb744..0d9e2b3728f9ab500bd5e44702718535
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index d8f4d351a66c6d1e60e1a470ce64f538c7718232..d5d9f5d16a0972c2dac84f713dee940d21c56865 100644
index 88c58676e6d2eb618596cd118257cbf7973396a9..545d5e91db56ed7772b23a53c31c3c4dc08c11a1 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -421,7 +421,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

4
patches/server/0258-Allow-void-trading.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow void trading
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index f7f8e2291fa8abc88762b0b122b9b7fefc916cae..822308ff1fb9c0ba2137e2ef067e02e294d62480 100644
index 89e2c5298df7bbe82c1bc389d9d9014772d42e31..e149cca91f87645d1479156d0ff40b8b6527fefc 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2569,7 +2569,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2578,7 +2578,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot Start
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
// Paper start