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@e51401e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8347)
PaperMC/Paper@51183af Fix console completer/highlighter having invalid source stack (#8346)
This commit is contained in:
BillyGalbreath
2022-09-10 04:46:02 -05:00
parent 5f14c32a66
commit 664774af5a
16 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0008-Ridables.patch
View File

@@ -34,7 +34,7 @@ index 98a166edfda01f5e07a144a34fd57f0e83b8893c..50d077470a3a606b97ea4ae499837de6
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index da146b6e30a97ed27732165e3defa747bef7c14b..e79963efa8781ec8189255a44e8789ec279b0a61 100644
index 42c88ef31474690c95f7cfe7c3075e1f854c4005..738ffcc9f8ec1b34e7e1357ae48283e3245d906f 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -66,10 +66,10 @@ index 2049fa1008be5208d9bb168dd65483613a7296f1..8e3e3dbbea328f76a790477545b46d2d
public void doTick() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 5d8f2eedb1c2acc82e61a4adc3c688802e2d25a7..34955c9dc680eb64403848da27ce0c5121ef8be5 100644
index ec77de694db65e3d67cc719fb160af2ecedb8678..cdc22a9e07dc91b6fca4b36736f2eaf105275a6f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2915,6 +2915,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2909,6 +2909,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
@@ -5146,7 +5146,7 @@ index 4132c1113f5437a776e5e3c1cb306904775aed88..1a945a32c3d3705a318ebca72a365931
public void tick() {
super.tick();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 6549ade8e19807c523e5a1dc68b66585aad438b1..11d51beb52c326a9fc040322a79d3916a8ddd0a2 100644
index 492fd9b72cc68d43d3a021f768a87296ff601ac9..18e0b4d9a4ba8189e6b431c52f46bbc461386f58 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1355,4 +1355,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -5236,7 +5236,7 @@ index 6dbb2e10ed244845fe9f857b237589900ea3cf40..5aee512c0a5a0b5f5fac4214f682b398
+ }
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 18cceb978c812162622f7285bbe18e647eb08017..2521c6f055b1631979cf281dc158c5f25623c259 100644
index 98784ef305393ba90ca54efde363b2fea5757b3d..3a9c885dd59bd5a8c3f54b8397701e4e0c9ca8b7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -91,4 +91,706 @@ public class PurpurWorldConfig {