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

Updated Upstream (Paper & Pufferfish)

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

Paper Changes:
PaperMC/Paper@29b17a8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9088)
PaperMC/Paper@b5ce6e3 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9104)
PaperMC/Paper@9cda284 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@f8c0112 {ci skip} add missing labels to project status map (#9106)
PaperMC/Paper@6a7fef0 Allow entity effect changes off the main thread for worldgen (#8942)
PaperMC/Paper@f8d2f82 Resolve Plugin Dependency Issues, Improve PluginLoading Compat, Small Loading Issues (#9068)
PaperMC/Paper@b626528 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@058d7c1 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@ab72b12 Update Adventure to 4.13.1 (#9113)
PaperMC/Paper@8be7a60 Fix getBrightness and getRawBrightness throwing exception in BlockStateListPopulator (#9111)
PaperMC/Paper@e811927 Revert "Resolve Plugin Dependency Issues, Improve PluginLoading Compat, Small Loading Issues (#9068)"

Pufferfish Changes:
pufferfish-gg/Pufferfish@da9fd85 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@751dfb0 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@c09a154 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@b778163 Updated Upstream (Paper)
This commit is contained in:
granny
2023-04-10 04:06:22 -07:00
parent 1407eef7e0
commit f952106e1b
56 changed files with 238 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0277-Remove-Mojang-Profiler.patch
View File

@@ -39,7 +39,7 @@ index 314ab6183e31b4bac6a40c1f8007d48e9cab1760..6b05907bfec377e72a8858534d001bda
return b0;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 123c7f9730a999ea5ea11de817fa61cc455e6962..ee0a1f4be8a30f90e4c64deb31c06a78690aa09e 100644
index 68552716b7ed7f93cb84b1951af85344dc2e83b0..2bd58d13d4c48fdddee56e2b417b68fe15072386 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -343,13 +343,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -418,7 +418,7 @@ index eaef5f9119cd2e5eab2476f4126daff912eeaeb2..57fdef8b16e1ed9a4693356144b4685b
public boolean hasWork() {
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 7dde0357d0c63469176a44d84631c52efdd83d41..30d364b385da21544a810a76f436f06879d39b14 100644
index 2c23321c826d929981df51f2cc60cdcdb649a43f..0ae45cf5a084fd412305e8b2f5dabe608b4eb1c1 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -431,16 +431,16 @@ public class ServerChunkCache extends ChunkSource {
@@ -556,7 +556,7 @@ index 7dde0357d0c63469176a44d84631c52efdd83d41..30d364b385da21544a810a76f436f068
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 2d367377ac024b6ab3d9072813d03ad36db5a22d..06b0b78d16804b4bf8f6b5bb29b21b0eda57f0fc 100644
index 2b82da383452b290ae99197c743e9a6ee5497713..10d602b947edaae6b78efe9d0773021bcb1c35bf 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 {
@@ -768,7 +768,7 @@ index 2d367377ac024b6ab3d9072813d03ad36db5a22d..06b0b78d16804b4bf8f6b5bb29b21b0e
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 de504623d3b7aff451edbc9b87249c99efbcbed4..9081d891ddb61df628009232efdb31d66d5f71b6 100644
index 15a5ad23531848dce7c6b0be9eefefb70e150608..ac63f8d93048a0e61f1e27abb4cc5e2b5cc5208e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1197,7 +1197,7 @@ public class ServerPlayer extends Player {
@@ -801,10 +801,10 @@ index de504623d3b7aff451edbc9b87249c99efbcbed4..9081d891ddb61df628009232efdb31d6
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 43a5eb13728bee99cdf87947d98c042689d1af53..d37bbff4375724fe85d1ed5cc0fa0696736736ac 100644
index 399cdbd7d4b7903edff051fb16e2522e921cd325..65835b5fc9a65acee158e7fc784e7d3af677f1e3 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -408,7 +408,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -409,7 +409,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.aboveGroundVehicleTickCount = 0;
}
@@ -813,7 +813,7 @@ index 43a5eb13728bee99cdf87947d98c042689d1af53..d37bbff4375724fe85d1ed5cc0fa0696
// Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
// This should effectively place the keepalive handling back to "as it was" before 1.12.2
long currentTime = Util.getMillis();
@@ -444,7 +444,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -445,7 +445,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
// Paper end
@@ -1027,7 +1027,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 9cdfd0a72b020d3820276dfa400b345bc00dd36b..c44d0e77fc610cd0fe540ee25d6773ff97f25031 100644
index 20221ab20b5589f663b8d26c504578af33adc8f2..55116e7a7b70a6f9db187ac7ef0747fe5100cacd 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -823,7 +823,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1153,7 +1153,7 @@ index 9cdfd0a72b020d3820276dfa400b345bc00dd36b..c44d0e77fc610cd0fe540ee25d6773ff
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index fe68a9e0cf53c4a8c3411123521e71a482e3ced9..79925dcc3dec57bae886263a804de28e2bd6ad72 100644
index d96de1ee220465cb268819f9683d52a1251ff36a..ac323afc8491749969e53aa3841bc684d79c48d3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -393,7 +393,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1824,10 +1824,10 @@ index 54467e5ab4a4629f88fe48bd4b7f0db821e4553f..ba4f51e081f4352530998a9a7fbf0252
// Paper start
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 3922a639a91b12c419ce566f6cf84f5466c2e0e3..b367184f415b6e20c2fc02a1e8853003349a0a1b 100644
index 4b71677a145918854cfc6aff40f0bc71933864f7..e9d92bf484fb0d2fcb66a7c424eced109bfa031d 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -1319,9 +1319,9 @@ public class LevelChunk extends ChunkAccess {
@@ -1315,9 +1315,9 @@ public class LevelChunk extends ChunkAccess {
if (LevelChunk.this.isTicking(blockposition)) {
try {
@@ -1839,7 +1839,7 @@ index 3922a639a91b12c419ce566f6cf84f5466c2e0e3..b367184f415b6e20c2fc02a1e8853003
//this.blockEntity.tickTimer.startTiming(); // Spigot // Purpur
BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
@@ -1333,7 +1333,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1329,7 +1329,7 @@ public class LevelChunk extends ChunkAccess {
LevelChunk.LOGGER.warn("Block entity {} @ {} state {} invalid for ticking:", new Object[]{LogUtils.defer(this::getType), LogUtils.defer(this::getPos), iblockdata});
}