Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Paper)

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

PaperMC/Paper@42a9c37 Move Adventure patch up
PaperMC/Paper@1d7a6a0 Add missing glow_item_frame walkers
PaperMC/Paper@f9b05cc Expose furnace minecart push property. (#7548)
PaperMC/Paper@9351513 Fix handling message in PlayerHandshakeEvent (#7542)
PaperMC/Paper@6564f70 Fix cancelling ProjectileHitEvent for piercing arrows (#7492)
PaperMC/Paper@196271d Fix save problems on shutdown
PaperMC/Paper@1e12cf8 Add more to the save fixes
PaperMC/Paper@a36d7f6 Updated Upstream (CraftBukkit)
PaperMC/Paper@7b9c30f Fix scoreboard objective name length limit
PaperMC/Paper@d9bf5e7 Add method to set noclip on arrows (#7263)
PaperMC/Paper@c34fb09 Add ghast api (#7554)
PaperMC/Paper@e0b3f3f Adventure 4.10.1
PaperMC/Paper@718fab1 Add CPU name and JVM vendor info in timings (#7490)
PaperMC/Paper@7a21333 Fix setting the view distance to 32 (#7503)
PaperMC/Paper@4423e12 Update docs link in paper.yml (#7562)
PaperMC/Paper@b55ba19 Update README for new docs (#7561)
PaperMC/Paper@657d163 Prevent despawned navigators being readded (#7574)
PaperMC/Paper@d714682 Add more entity api (#7564)
PaperMC/Paper@1790528 More projectile API (#5731)
PaperMC/Paper@ea1efef Remove Patches (#7541)
PaperMC/Paper@aab1f8a Fix swamp hut cat generation deadlock
PaperMC/Paper@dc96bba Ensure the item sent isn't air (#7584)
PaperMC/Paper@bfa33d9 Various improvements to console color formatting (#7560)
PaperMC/Paper@87927e1 Fix CreativeCategory API (#7586)
PaperMC/Paper@ab03538 Fix colors in some console messages
PaperMC/Paper@1358d1e Updated Upstream (CraftBukkit/Spigot) (#7580)
PaperMC/Paper@b65b48f [ci skip] Update gradle wrapper
PaperMC/Paper@1ce3555 [ci-skip] Fix typo in feature request issue template (#7593)
PaperMC/Paper@c8e49cc Add get/set wait time for fish hooks. (#5595)
PaperMC/Paper@a5be178 Use correct toX/Y/Z in player move packet handling
PaperMC/Paper@0ca80c7 Add getComputedBiome API (#5668)
PaperMC/Paper@2d3e8f7 Properly lookup random-ticked precipitation blocks (#7606)
PaperMC/Paper@f35a0ce Remove Java version check once and for all (#7612)
PaperMC/Paper@1c5f8b0 Updated Upstream (Bukkit/CraftBukkit) (#7604)
PaperMC/Paper@f0d0078 Add debug for invalid GameProfiles on skull blocks/items (#7512)
PaperMC/Paper@8788bf7 fix datapacks not being able to modify nether/end (#7588)
PaperMC/Paper@b8c90d2 Added method to check snapshot state of TileStates (#7325)
PaperMC/Paper@8897cea Add enchantWithLevels API (#7615)
PaperMC/Paper@2eeca6f Fix world saving in unloadWorld
PaperMC/Paper@319d5fa Fix state locking for getTopMRUProfiles & getProfileIfCached
PaperMC/Paper@bc68ee0 Remove redundant GameProfileCache diff
PaperMC/Paper@855637f Updated Upstream (CraftBukkit) (#7624)
PaperMC/Paper@5eb61dd Buffer OOB setBlock calls
PaperMC/Paper@7b46444 Properly create profiles with custom name/uuid (#7558)
PaperMC/Paper@a686ff5 Add more missing entity API (#7592)
PaperMC/Paper@993f828 Add TameableDeathMessageEvent (#5392)
PaperMC/Paper@a939d6e Fix generator settings string for flat-type worlds (#7568)
PaperMC/Paper@ab666a4 Deprecating remaining blockkey methods (#7638)
PaperMC/Paper@e7d928a Fix EntityChangeBlockEvent#getBlockData for when sheep eats grass block (#7646)
PaperMC/Paper@e2f743d Fix PalettedContainer synchronization (#7663)
PaperMC/Paper@7fa8870 Updated Upstream (Bukkit/CraftBukkit) (#7672)
PaperMC/Paper@fa68bb1 Fix entity position desync for hanging entities (#7659)
PaperMC/Paper@d3c1023 fix player loottables running when mob loot gamerule is false (#7651)
PaperMC/Paper@7f47b9b Remove KeyedObject interface (#7680)
PaperMC/Paper@7bf9446 Add per player chunk loading limits
PaperMC/Paper@04c7b16 Undeprecate Material#isLegacy (#7679)
PaperMC/Paper@443c506 Fix Nullability Annotations for PrepareItemEnchantEvent (#7681)
PaperMC/Paper@ea2c81e Fix lectern quick move
PaperMC/Paper@87e11bf Cache resource keys instead of trying to create them (#7643)
PaperMC/Paper@820e9ca Update decompiler & param mappings
PaperMC/Paper@92426e3 Update Gradle wrapper
PaperMC/Paper@62dcff3 Update actions
PaperMC/Paper@2914457 Allow seting custom podium location for ender dragon (#7695)
PaperMC/Paper@11e0dcd Fix NBT pieces overriding a block entity during worldgen deadlock (#7692)
PaperMC/Paper@2f16393 Updated Upstream (CraftBukkit)
PaperMC/Paper@4322c05 Use patched spigot decompiler (#7706)
PaperMC/Paper@f8e8d6c Strip enderpearl owners when they are no longer ticked (#7559)
PaperMC/Paper@e42d683 Fix StructureGrowEvent species for RED_MUSHROOM
PaperMC/Paper@a9ee104 Prevent tile entity copies loading chunks
PaperMC/Paper@d4a712d [CI-SKIP] Remove unused import from last patch
PaperMC/Paper@a9f252e Replace third party repos with Paper repo (#7733)
PaperMC/Paper@b8fa41e [ci skip] Remove Mojang repo from test-plugin
PaperMC/Paper@c6e631a Use username instead of display name in PlayerList#getPlayerStats (#7740)
PaperMC/Paper@1cfd363 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@af94364 Fix slime spawners not spawning outside slime chunks (#7741)
PaperMC/Paper@6b9f7a0 Don't fire worldborder events for virtual borders (#7749)
PaperMC/Paper@8bfb1d2 Pass ServerLevel for gamerule callbacks (#7668)
PaperMC/Paper@c66b0f9 Add pre-unbreaking amount to PlayerItemDamageEvent (#7724)
PaperMC/Paper@86fb3d2 Don't send itemmeta for books with the hide option enabled (#7734)
PaperMC/Paper@c642d25 Improve update folder behavior (#7687)
PaperMC/Paper@c7d4c01 Ignore invalid jars inside of the updates folder (Fixes #7751)
PaperMC/Paper@4ecc338 WorldCreator#keepSpawnLoaded (#7673)
PaperMC/Paper@873bfa6 Remove World#refreshChunk deprecation (#7684)
PaperMC/Paper@76ed156 Grant temporary immunity from EAR to moving entities (Fixes #7637) (#7644)
PaperMC/Paper@567fce6 Don't apply previous potion when item is potion (fixes #7756) (#7757)
PaperMC/Paper@c449f6a Build updates
PaperMC/Paper@ef6a1a5 Revert to old createProfile(UUID, String) logic (#7723)
PaperMC/Paper@0f8aa4e Fix NPE for BlockDataMeta#getBlockData (#7670)
PaperMC/Paper@16f224a Trigger bee_nest_destroyed trigger in the correct place (#7436)
PaperMC/Paper@caf4a6f Remove or replace a few dumb deprecations (#7760)
PaperMC/Paper@47f43da Add missing javadoc deprecation msgs for PlayerProfile (#7688)
PaperMC/Paper@fbbc03a Add EntityDyeEvent and CollarColorable interface (#7625)
PaperMC/Paper@5b85ee3 Fire CauldronLevelChange on initial fill (#7678)
PaperMC/Paper@4dc78ae Fix some team color docs and added hasColor (#7602)
PaperMC/Paper@0bf7c95 Fix opening inv in PlayerRecipeBookClickEvent handler (#7552)
PaperMC/Paper@d70ac03 fix powder snow cauldrons not turning to water (#7229)
PaperMC/Paper@ce059b4 Fix V1451 dataconverter stat types
PaperMC/Paper@6f5e6c6 Use setMessage instead of arraycopy
PaperMC/Paper@608482d cleanup filtered sign text (#7777)
PaperMC/Paper@4166632 Updated Upstream (Bukkit/CraftBukkit) (#7776)
PaperMC/Paper@e564110 Couple fixes/improvements to PlayerSetSpawnEvent (#6754)
PaperMC/Paper@e5da93a Deprecate duplicate SoundGroup API (#7509)
PaperMC/Paper@2ab0258 Use mojang item ids for alternative item despawn rate (#6997)
PaperMC/Paper@f6a69de Undeprecate getOfflinePlayer (#7773)
PaperMC/Paper@a117da6 Add PlayerStopUsingItemEvent (#7787)
PaperMC/Paper@f3a8a0b FallingBlock auto expire setting (#7037)
PaperMC/Paper@4219389 Don't tick markers (#7299)
PaperMC/Paper@2515bc4 Improve configurable door difficulty (#6985)
PaperMC/Paper@8c9d98e Clean unused field for Configurable door breaking difficulty (#7793)
PaperMC/Paper@b831784 Only log for passenger / vehicle world mismatch
PaperMC/Paper@7a6163b Add Alternate Current's redstone implementation as an alternative to Vanilla and Eigencraft's. (#7701)
PaperMC/Paper@1a17a83 Move redstone config changes to Eigencraft patch
PaperMC/Paper@87d2eb2 Fix door breaking difficulty defaults for vindicator (#7795)
PaperMC/Paper@e399754 Do not accept invalid client settings
PaperMC/Paper@268476b Fix whitespace error in Alternate Current patch
PaperMC/Paper@18f0f8d Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@5928327 Remove unneeded patch (#7806)
PaperMC/Paper@9fd870d Fix cancelling PlayerItemFrameChangeEvent (#7761)
PaperMC/Paper@8d1de8d deprecate old MaterialData api (#7585)
PaperMC/Paper@0116751 List world on tile entity placement exception (#7709)
PaperMC/Paper@73bd35d Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@7045f18 Change link to screamingsandals
PaperMC/Paper@ca62386 Hide ores with deepslate at Y=4 and below (#7792)
PaperMC/Paper@9b492cf Deprecate set/doesBounce from Projectile (#7800)
PaperMC/Paper@ed4e916 [ci-skip] Update repository and API urls (#7835)
PaperMC/Paper@fc1752f Fix more upstream javadocs (#7837)
PaperMC/Paper@123cad5 Remove incorrect parent perm from debugstick.always (#7846)
PaperMC/Paper@d8108b5 team color parameter may be null, causing NPE
PaperMC/Paper@31ccc57 Add support for Proxy Protocol (#7710)
PaperMC/Paper@a90092e Updated Upstream (CraftBukkit/Spigot) (#7848)
PaperMC/Paper@79e07f3 Fix addPassenger for Marker (#7762)
PaperMC/Paper@182a609 Fix duplicate world keys via createWorld (#7614)
PaperMC/Paper@b6a6544 Provide ComponentSerializer services (#7527)
PaperMC/Paper@3f7fbe3 Fix cb's janky level name in WorldCreator (#7851)
PaperMC/Paper@af3b377 Update ForgeFlower (#7857)
PaperMC/Paper@9667181 Fix OfflinePlayer#getBedSpawnLocation (#7861)
PaperMC/Paper@c123915 Fix FurnaceInventory for smokers and blast furnaces (#7249)
PaperMC/Paper@f7382f5 Remove unneeded UOE when copying biome sources (#7629)
PaperMC/Paper@6b035fd Update default vanilla command perms (#7386)
PaperMC/Paper@f210f67 Update the rewriteForIde for new cb package version (#7242)
PaperMC/Paper@3f7111d Fix EntityEquipment and related javadocs (#7380)
PaperMC/Paper@78e6431 Add default kick msg component (#6886)
PaperMC/Paper@04e1b07 Check HAProxyMessage type is PROXY (#7864)
PaperMC/Paper@00c6ae8 Implement Translatable on CreativeCategory (#7587)
PaperMC/Paper@7602dd2 Sanitize Sent BlockEntity NBT (#7010)
PaperMC/Paper@2d17a50 Add translation keys to GameMode enum (#7081)
PaperMC/Paper@c5caee3 Prevent entity loading causing async lookups (#7553)
PaperMC/Paper@71fe3c6 Add numeric string completion suggestions as int suggestions (#6360)
PaperMC/Paper@b1ac25f Respect x-ray permission in World#refreshChunk (#7214)
PaperMC/Paper@1d08ce8 Disable book selector resolving by default
PaperMC/Paper@80d5e71 Updated Upstream (Bukkit)
PaperMC/Paper@2033dba Updated Upstream (CraftBukkit)
PaperMC/Paper@a3ad720 Remove ChatColor usages (#7543)
PaperMC/Paper@8fc0999 Fix some nullability things (#7275)
PaperMC/Paper@fd069dd Remove incorrect throws javadoc in Team (#7869)
PaperMC/Paper@bed5cb2 Limit resolved selectors when enabled
PaperMC/Paper@4d83ed0 [ci skip] Changing the order of the rebase with autosquash command in the contributing.md (#6974)
PaperMC/Paper@071a4a2 throw exception if worlds are created while being ticked (#7653)
PaperMC/Paper@5b6397a Make leave messages for kicks the same as for quitting (#7874)
PaperMC/Paper@5befb55 Updated Upstream (Bukkit/CraftBukkit) (#7875)
PaperMC/Paper@b3deb25 Move some methods to RegionAccessor (#7635)
PaperMC/Paper@d8ef841 [DataConverter] Fix generator options parsing
PaperMC/Paper@4b27254 Fix treasure maps discovered settings (#7627)
PaperMC/Paper@276d830 Fix campfire walker in V1920
PaperMC/Paper@3925a53 Make timings link clickable (#7944)
This commit is contained in:
Lexi
2022-06-12 18:18:03 -04:00
parent 9b316cd4b3
commit f5430d06d7
18 changed files with 91 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0001-Build-changes.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 4beb35d1e5b013395f5df101e843f41c2ce174ad..a2f1e252630c4ac0f2521a3f53be60116995617e 100644
index 0282e3b75470e1a68ea1fc228082483514ba432e..9c860b39f1131920ea747783423a736b8ca2c915 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,8 +18,8 @@ repositories {
@@ -9,8 +9,8 @@ plugins {
}
dependencies {
@@ -19,7 +19,7 @@ index 4beb35d1e5b013395f5df101e843f41c2ce174ad..a2f1e252630c4ac0f2521a3f53be6011
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -68,7 +68,7 @@ tasks.jar {
@@ -60,7 +60,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -28,7 +28,7 @@ index 4beb35d1e5b013395f5df101e843f41c2ce174ad..a2f1e252630c4ac0f2521a3f53be6011
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -84,7 +84,27 @@ tasks.jar {
@@ -77,7 +77,27 @@ tasks.jar {
publishing {
publications.create<MavenPublication>("maven") {
@@ -57,7 +57,7 @@ index 4beb35d1e5b013395f5df101e843f41c2ce174ad..a2f1e252630c4ac0f2521a3f53be6011
}
}
@@ -156,7 +176,7 @@ fun TaskContainer.registerRunTask(
@@ -148,7 +168,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -80,7 +80,7 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..52126870f1fc15a9ddce4452673b236e
/**
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
index ece77f5ea4b14bbed7c070131b3251ea86764538..71bf426f7fb58fff6739bb1332d1286db810d434 100644
index bf42969859545a8a520923ef1836ffa4a5cc24a0..2532e265c5dade55f71c34fcab6d1e74bbb58a87 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -104,10 +104,10 @@ index ece77f5ea4b14bbed7c070131b3251ea86764538..71bf426f7fb58fff6739bb1332d1286d
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 07c382f30ed3736ed15b5b71f48dc4a1de958242..6994038e8371a7d506d5f4c5abdf3b441f329231 100644
index da15a224b8b974e78b9d8d5f514229b3b2a5a63e..f2b5e78b3fe68c38e755b9b4a8f96077ac6800f2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1683,7 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1696,7 +1696,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -117,10 +117,10 @@ index 07c382f30ed3736ed15b5b71f48dc4a1de958242..6994038e8371a7d506d5f4c5abdf3b44
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7343bd96a4a15f4abc081e565175db8df930a470..22619586b0d821123ed7bfb14744cfb27567522c 100644
index 8a248e34fce1e04de4460f98b7627df495c66af1..83f75d9c4ad146ba0a0ef28d0e49a1deb6db6a44 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -130,10 +130,10 @@ index 7343bd96a4a15f4abc081e565175db8df930a470..22619586b0d821123ed7bfb14744cfb2
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index afcc80d1f79d1743b0940c69858eacec88fec889..8fcd1d4f4cc74a281c419ada3470b6823494a8c5 100644
index fbe68bd4739d9a0e7d9bc4c3d5ba8ecfd2d13954..5ca8e89cdca1d710d9236e62fa315042d36c5d77 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -269,7 +269,7 @@ public class Main {
@@ -265,7 +265,7 @@ public class Main {
if (buildDate.before(deadline.getTime())) {
// Paper start - This is some stupid bullshit
System.err.println("*** Warning, you've not updated in a while! ***");
@@ -156,7 +156,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..6f1b3fa6ebeabc7596034663ed06686f
if (stream != null) {
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index bee38307494188800886a1622fed229b88dbd8f1..104d9f4fcad6d5895a1f4e3cd1966dccc4530da7 100644
index 24fefa521093448e608e217af7b88a6397a4b054..22273e6525e65829099a14f68b79933794f715db 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -163,7 +163,7 @@ public class WatchdogThread extends Thread