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@805423c Add ARMOR tag to MaterialTags (1.19) (#7987)
PaperMC/Paper@4a48ed3 Add option for strict advancement dimension checks (#7954)
PaperMC/Paper@17c1c6c Add missing important BlockStateListPopulator methods (#7952)
This commit is contained in:
BillyGalbreath
2022-06-15 12:40:47 -05:00
parent 92b2fd2a0c
commit 00603687b3
9 changed files with 25 additions and 25 deletions
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-R0.1-SNAPSHOT
paperCommit = e3042d2506d73f94b310926bb91db62ae358d962
paperCommit = 17c1c6c3e71c4fbef3a86ca6a0e64d2a46910669
org.gradle.caching = true
org.gradle.parallel = true

4
patches/server/0007-Component-related-conveniences.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 9a5e3f75663f6dd3351e23d850c446874c03b6a0..070b7d49b46e6e23b4baf33ac045582194579137 100644
index 6b63a8e880e93866e12e90769951bfcd844528f9..3ed1bd3f9a75056c040a3563533d53ad4438b962 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1699,6 +1699,26 @@ public class ServerPlayer extends Player {
@@ -1705,6 +1705,26 @@ public class ServerPlayer extends Player {
this.lastSentExp = -1; // CraftBukkit - Added to reset
}

6
patches/server/0013-AFK-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index f4b33e5788665eefef35e701ed99d58d0ea1b3c2..e40e8e837273c243f5ccc192514d540440f49310 100644
index 2842ba7028bf833478758f2e839796b25084b1b3..faaf63fe5afd825de34a5c4c586d106f859d0d47 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2000,8 +2000,58 @@ public class ServerPlayer extends Player {
@@ -2006,8 +2006,58 @@ public class ServerPlayer extends Player {
public void resetLastActionTime() {
this.lastActionTime = Util.getMillis();
@@ -255,7 +255,7 @@ index 8deb966c33b890560c8f5cc875d8225e29aa42e9..16aa402f7b9ff8c2f1748bc4c82005cc
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 6ea78ee90223e30d22403bc1eb0b20f994ba81d1..5a1da82889ae4326ceaadab2975402c98659b9e4 100644
index b079c084e47019938546bf9156178a077a0e2022..9839fb413d06b5dfc1d89a4aee4d05e53d613232 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -169,8 +169,16 @@ public class PurpurConfig {

6
patches/server/0020-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index e40e8e837273c243f5ccc192514d540440f49310..64183c02cf278b20ed59120fa20fc7265321fc40 100644
index faaf63fe5afd825de34a5c4c586d106f859d0d47..9397f5ff682a344282bcea2f6273ecbdcfe8ce1e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -54,7 +54,7 @@ index e40e8e837273c243f5ccc192514d540440f49310..64183c02cf278b20ed59120fa20fc726
return this;
}
}
@@ -1986,6 +1995,7 @@ public class ServerPlayer extends Player {
@@ -1992,6 +2001,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index e40e8e837273c243f5ccc192514d540440f49310..64183c02cf278b20ed59120fa20fc726
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2511,9 +2521,17 @@ public class ServerPlayer extends Player {
@@ -2517,9 +2527,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {

4
patches/server/0081-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 71f3fb4d60abff73dce22006345e210c706d448b..8e5aa1666ca929780670ce513d969973a513e21e 100644
index 02447483c634e21821fd2effd9b4e9a15818a662..c9757c20404aec1125a645d94c9af077408bbf5a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2582,4 +2582,26 @@ public class ServerPlayer extends Player {
@@ -2588,4 +2588,26 @@ public class ServerPlayer extends Player {
// CraftBukkit end
public final int getViewDistance() { throw new UnsupportedOperationException("Use PlayerChunkLoader"); } // Paper - placeholder

6
patches/server/0127-Implement-TPSBar.patch
View File

@@ -41,7 +41,7 @@ index 23454b660c123f4309d1b6eaab8f626f2663f2ef..3f7b8e62bb79d8618f962af4ea5dbec9
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index fe2d7acece87d5b825f3f3668c11c0efc877439b..c65eeec4ee990a1efaf5648ca31f8bb4a178ce2b 100644
index 3beced793b745ad309192d5687591d23acf46719..1de4f239dfb63250b7143e89e97487d048b99776 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index fe2d7acece87d5b825f3f3668c11c0efc877439b..c65eeec4ee990a1efaf5648ca31f8bb4
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2612,5 +2615,13 @@ public class ServerPlayer extends Player {
@@ -2618,5 +2621,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}
@@ -104,7 +104,7 @@ index dea412353ba3e997d8024cb0770b9ac7300b63a1..7b3ad3316243d0d8fd2106a0f0475e1b
entityplayer.awardStat(Stats.LEAVE_GAME);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index c55504d376f331b01d53aad6a9492ce2f8a4bbd3..47f4c08c354c2d683dd0959c22c68eb78920a5da 100644
index 65e8b5569ff12fc2a49b601b5f970dfd8b223f62..68ae78e98df34849e0a3c97d27b26d0f45cf4bb7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -176,6 +176,7 @@ public class PurpurConfig {

6
patches/server/0145-Config-to-ignore-nearby-mobs-when-sleeping.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4980b0b46e75a4bc914cb3719d8b394fbcd8c224..c74e15d4776d98f288454eb609a798a183e51ee8 100644
index bc5d5a2a48cfc6b4257d1cc3ac73d8ec5300721d..c217c773d014e1bda00ac14e90824d5bb636ecc4 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1335,7 +1335,7 @@ public class ServerPlayer extends Player {
@@ -1341,7 +1341,7 @@ public class ServerPlayer extends Player {
return entitymonster.isPreventingPlayerRest(this);
});
@@ -18,7 +18,7 @@ index 4980b0b46e75a4bc914cb3719d8b394fbcd8c224..c74e15d4776d98f288454eb609a798a1
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 57450c6f3da1289b15ecc821614018506c60601f..bfe0bf2572a48fee700bbbb2aa756ab61827b960 100644
index d10ec237ccebcfb72502c5f3b84f2a4ecac07ee8..f244f917b35b80f0801fecf08753da63a99443f0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -348,6 +348,7 @@ public class PurpurWorldConfig {

8
patches/server/0212-Add-compass-command.patch
View File

@@ -17,7 +17,7 @@ index 2fbb65c685ac88c77d54f27a5981a132fb44e370..d0ca327337206a64609c1b6ee652cf99
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 3927087d5cea154c2e8dba370fea47bdba65d05d..a90ec8363a41033db421d42896e7203e8616dd90 100644
index 8960cd89201758e325fb23bd15583af5bec39d7b..aace490037331f3ab59f2d13f6eecb3cf5ddfe80 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 3927087d5cea154c2e8dba370fea47bdba65d05d..a90ec8363a41033db421d42896e7203e
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2625,5 +2628,13 @@ public class ServerPlayer extends Player {
@@ -2631,5 +2634,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}
@@ -59,7 +59,7 @@ index 3927087d5cea154c2e8dba370fea47bdba65d05d..a90ec8363a41033db421d42896e7203e
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 021d2ba371303bc5de0d0b30dfc5332de39d179f..6c158fefeef4634d41816fe00c721cefaf7d7455 100644
index ead823c2efe352d7c62daa491dd8c148c5dc9ab2..5c1da692d6ba145e5c9d08c17f69dbd4661a9ddb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -263,6 +263,11 @@ public class PurpurConfig {
@@ -89,7 +89,7 @@ index 021d2ba371303bc5de0d0b30dfc5332de39d179f..6c158fefeef4634d41816fe00c721cef
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4cc629ee614c4ff43181af6992786c4eac190f5a..26d9943ada0bec112c5fc1ccc67d1af2a5308001 100644
index 0b1c5a91568c2e7667dc04665ee89436d0fb92ad..837ea79e092ad00749ce6a5bead3a2a3bd42618f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -217,6 +217,7 @@ public class PurpurWorldConfig {

8
patches/server/0240-Signs-allow-color-codes.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a90ec8363a41033db421d42896e7203e8616dd90..a5b03184ba1199d68bf2c9125c05d4b7ad785d45 100644
index aace490037331f3ab59f2d13f6eecb3cf5ddfe80..9c09e46aeea0527880e935c1e3cf1046036d5764 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1510,6 +1510,7 @@ public class ServerPlayer extends Player {
@@ -1516,6 +1516,7 @@ public class ServerPlayer extends Player {
@Override
public void openTextEdit(SignBlockEntity sign) {
@@ -42,7 +42,7 @@ index 4d61504698a54af354fdf047426f87771397cc02..05bda808496f38d10416c3702b1f97fe
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.player.getBukkitEntity(), lines);
this.cserver.getPluginManager().callEvent(event);
diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
index 6c96c3dde4e1b1b1b6952841edb41006e73737e9..c02cf76cce353aff189b3e0a967e88f7b15d1b1f 100644
index def4fdd2c7e4f925fa128692a744e5d10ae0203a..73382580cc23cbc868a6003e74826a5557c8afc5 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
@@ -184,6 +184,23 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
@@ -70,7 +70,7 @@ index 6c96c3dde4e1b1b1b6952841edb41006e73737e9..c02cf76cce353aff189b3e0a967e88f7
public CompoundTag getUpdateTag() {
return this.saveWithoutMetadata();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0d2de5ec6b47dc2470e3f2f704076ff0d8b51778..57bc59537abfde26d1fe62f3661dc8eafd811e77 100644
index 70504e9190a34fb76862fd1d7a75a7340d6bf4f8..7c7434a13a17a28ee08a0f4f1f4959f77849170c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -928,8 +928,10 @@ public class PurpurWorldConfig {