Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-22 08:19:26 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@1e7dd72 Remove 'fix Vanilla Minecart speed' patch (#10068)
PaperMC/Paper@e7e1c8a Fix and add new scoreboard API (#10037)
PaperMC/Paper@49f9f6f Add Registry#getKey (#10066)
PaperMC/Paper@4adca3d Update to adventure 4.15 (#10045)
PaperMC/Paper@ff7b9b0 Increase default custom payload channel size limit (#10006)
PaperMC/Paper@1cda66e Hotfix Entity isInRain reobf issue
PaperMC/Paper@61768e0 [ci skip] Remove no longer needed mappings change
PaperMC/Paper@e035fd7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@c215ce1 [ci skip] cleanup patch diff from last commit
PaperMC/Paper@4fdda9e Keep newlines in outdated client/server message (#10042)
PaperMC/Paper@f483b38 fix NPE on EntityTeleportEvent getTo (#10016)
PaperMC/Paper@dc62150 Catch async usage of playsound (#10021)
PaperMC/Paper@0d6a0c3 Fix command block async message (again) (#10082)
PaperMC/Paper@d1f507f Don't fire 2 game events for certain cauldron interactions (#8904)
PaperMC/Paper@a401585 Fix campfire recipes not always outputting full result (#8754)
PaperMC/Paper@88d28d6 Fix long loading screen when refreshing skins (#10026)
PaperMC/Paper@c081104 Add experience points api (#9688)
PaperMC/Paper@8221b08 Fix global sound event gamerule not being respected (#8727)
PaperMC/Paper@3c0d6aa Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10085)
PaperMC/Paper@2c3ccb8 Add drops to shear events (#5678)
PaperMC/Paper@b2ffb1b Add PlayerShieldDisableEvent (#9177)
PaperMC/Paper@2951732 Add HiddenPotionEffect API (#9910)
PaperMC/Paper@e4ab50d Properly disallow async Player#chat (#8123)
PaperMC/Paper@5e978d3 Fix Folia scheduler tasks not canceling when plugin disable (#10091)
PaperMC/Paper@e56e53f Fix some component bugs in login disconnect packet (#10090)
PaperMC/Paper@3484ae9 Call entity_die game event after event cancel check (#10096)
PaperMC/Paper@0ae58c0 cleanup player death event adventure logic (#10095)
PaperMC/Paper@1281f4f Make region/lock shift accessors per world
PaperMC/Paper@983377b Correctly check if bucket dispenses will succeed for event (#10109)
PaperMC/Paper@58e120b [ci skip] Remove extraneous diff added in 1.20.3 update (#10101)
PaperMC/Paper@816bacc Call EntityChangeBlockEvent for cake eating (#10105)
PaperMC/Paper@692db0c fix CustomModelData being removed (#10113)
PaperMC/Paper@509876d Keep fully frozen entities fully activated (#10103)
PaperMC/Paper@1fa48d1 include relative flags in PlayerTeleportEvent (#8190)
PaperMC/Paper@ae001ae Fix untrack event not being called for all 'untracks' (#10110)
PaperMC/Paper@259bc76 Pass system properties to maven repo session (#10117)
PaperMC/Paper@b2a6d57 Validate ResourceLocation in NBT reading
PaperMC/Paper@7eaff48 [ci skip] Replace some magic values with constant references
PaperMC/Paper@19a6202 Fix experience & improvements to block events (#8067)
PaperMC/Paper@8379027 Fix cmd permission levels for command blocks (#7404)
PaperMC/Paper@a93acc4 Fix EntityChangePoseEvent being called during worldgen (#10120)
PaperMC/Paper@25a99b1 Fix BlockDestroyEvents effectBlock not being set (#10131)
PaperMC/Paper@a58e29d Fix a borked update of 'Properly handle BlockBreakEvent#isDropItems' (#10134)
PaperMC/Paper@570cfb4 Validate missed resource location parsing
PaperMC/Paper@e46276e Fixup NamespacedKey parsing
PaperMC/Paper@f1c5f01 [ci skip] Fix typo
PaperMC/Paper@07b956e Fix tests by disabling them
This commit is contained in:
Samsuik
2024-01-08 14:50:33 +00:00
parent 9ac588a6ff
commit fb091042cc
18 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0020-Optimised-Explosions.patch
View File

@@ -632,10 +632,10 @@ index 08e8de35fddcd54c5f466edb264aa454a5935c42..26b0c5d77fe10153300030c0f0fb0f63
this.isIteratingOverLevels = false; // Paper
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index a507605a04af7f576548129517029192309fd9e7..65fe46780a9f9687d328afb5cca176ab4da23318 100644
index 620966965f3d73cd6fdbf03dabe2605c45d51d57..a25b1e73e33459dc0a4c8d64f35d5731ec44e5cc 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1961,6 +1961,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1967,6 +1967,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
explosion.clearToBlow();
}
@@ -648,7 +648,7 @@ index a507605a04af7f576548129517029192309fd9e7..65fe46780a9f9687d328afb5cca176ab
Iterator iterator = this.players.iterator();
while (iterator.hasNext()) {
@@ -1971,7 +1977,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1977,7 +1983,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
@@ -999,7 +999,7 @@ index f529f5d0f28533ec89f3ee712e59745991d068ee..d0ff7710577c1cfedae494796e6db420
public float getEntityDamageAmount(Explosion explosion, Entity entity, double seenPercent) {
// Paper end - actually optimise explosions
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 37fbba2f6eb32f2806ae1fec90d7be800ba91d49..c63c5c1451d5678ddea0d570ff2628af258490ae 100644
index 467ac21893d2e2ee07bc3ce7852ceb87dfe56cdf..1bb8c3c3a64826261bab23cfb3098596ac972084 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -238,6 +238,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1010,7 +1010,7 @@ index 37fbba2f6eb32f2806ae1fec90d7be800ba91d49..c63c5c1451d5678ddea0d570ff2628af
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, Supplier<me.samsuik.sakura.configuration.WorldConfiguration> sakuraWorldConfigCreator, java.util.concurrent.Executor executor) { // Sakura // Paper - Async-Anti-Xray - Pass executor
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
@@ -1431,7 +1432,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1430,7 +1431,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
Explosion.BlockInteraction explosion_effect1 = explosion_effect;