Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +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@e574412 Replace ConfiguredStructure api with Structure (#8642)
PaperMC/Paper@a172880 Update ForgeFlower to 2.0.627.2, fixes dev bundle not applying with Java 19 runtime
PaperMC/Paper@4151f75 /paper entity list QOL improvements (#8876)
PaperMC/Paper@8a815a0 Fix rendering for translatable death messages (#8534)
PaperMC/Paper@d30cda1 Add TeleportFlags (#8855)
PaperMC/Paper@3dcf4e4 Add EntityFertilizeEggEvent (#8041)
PaperMC/Paper@f2075c4 Take in account waterlogged block for the event (#8623)
PaperMC/Paper@e5e75dd Include previous spawn angle in SpawnChangeEvent (#8606)
PaperMC/Paper@541753b Fix HumanEntity#drop not updating the client inventory (#6761)
This commit is contained in:
granny
2023-03-05 03:32:31 -08:00
parent 3940c828a6
commit ade1ed1d98
31 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0279-Remove-Mojang-Profiler.patch
View File

@@ -39,7 +39,7 @@ index 3501c04a9dd745b56d701bc20e18ead4add726f5..71fe34621178af4ae9e9aa0ee945c235
return b0;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 58da87f8b01f438ab282d960026b7e4cc6c0b5a2..0aeb570d86bbfd2d056bf9630e8ccaeefd9d5306 100644
index b541b5d0875f5b04fa0c62d2cfdd054c92960705..55225d763a737b3859c2e7d6dbd19e5afc16438c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -339,13 +339,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -232,7 +232,7 @@ index 58da87f8b01f438ab282d960026b7e4cc6c0b5a2..0aeb570d86bbfd2d056bf9630e8ccaee
}
public boolean isNetherEnabled() {
@@ -2262,7 +2262,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2261,7 +2261,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@@ -241,7 +241,7 @@ index 58da87f8b01f438ab282d960026b7e4cc6c0b5a2..0aeb570d86bbfd2d056bf9630e8ccaee
return this.profiler;
}
@@ -2502,7 +2502,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2501,7 +2501,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// CraftBukkit end
private void startMetricsRecordingTick() {
@@ -250,7 +250,7 @@ index 58da87f8b01f438ab282d960026b7e4cc6c0b5a2..0aeb570d86bbfd2d056bf9630e8ccaee
this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
this.executeBlocking(() -> {
this.saveDebugReport(path.resolve("server"));
@@ -2512,40 +2512,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2511,40 +2511,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.willStartRecordingMetrics = false;
}
@@ -303,7 +303,7 @@ index 58da87f8b01f438ab282d960026b7e4cc6c0b5a2..0aeb570d86bbfd2d056bf9630e8ccaee
}
public Path getWorldPath(LevelResource worldSavePath) {
@@ -2594,15 +2594,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2593,15 +2593,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public boolean isTimeProfilerRunning() {
@@ -538,7 +538,7 @@ index 2c23321c826d929981df51f2cc60cdcdb649a43f..0ae45cf5a084fd412305e8b2f5dabe60
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index ece55efcd566bcb9b06d305496ab745807cfe975..b396a329e753f42b3878736b6b14bafda02d3744 100644
index 2e27ef78bac93e3fc9c7f7fc810396a789154bf0..a5655ebb233f1e1e1dd7f79fdd948020478928fc 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -654,12 +654,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -750,7 +750,7 @@ index ece55efcd566bcb9b06d305496ab745807cfe975..b396a329e753f42b3878736b6b14bafd
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index bec3d455ae3f639fbfda568c2573bacaa1ba7ccd..5822e94dcfb90615a98d4862ffb300a2140aaee7 100644
index 0410d56e1aefb4a51b84530ef00ad80b1a598d36..9fbb844b6dfe0ea6580e98e63e21ca9a60215372 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1184,7 +1184,7 @@ public class ServerPlayer extends Player {
@@ -783,7 +783,7 @@ index bec3d455ae3f639fbfda568c2573bacaa1ba7ccd..5822e94dcfb90615a98d4862ffb300a2
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index d468bb5e61ba25cfb2b462e2d0852256c64034d6..1cdb800ca42aa2c42feafc07f38b8f6bcecb4f5e 100644
index 7ad67462537d14f4e02cc31d0acdf028ecbfee5a..d6342833b2b7d0ad852e3d1f289574fb029e77c7 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -405,7 +405,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1505,7 +1505,7 @@ index 0ddae1d558316ca7129e51d59d4189fc8dd03c1a..c942f0093e0b88ec8a904698a613c64a
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
index 1164fdc49115f5178344276f073ac6c43a49411e..fe1f01d7aa27907298dd2e97e6b4d4fa9c507628 100644
index ccb13cd4add3127fa32d98f12e69ef0ac41bc3c0..d34600bca83e2742c2f26c300e4528f0bbd203e8 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
@@ -233,13 +233,13 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {