9
0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-20 15:29:33 +00:00
Files
SakuraMC/patches/server/0026-Cache-MovingBlockEntity-collision-shape.patch
Samsuik cc574e807d Updated Upstream (Paper 1.20.6)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@abc49bf Begin update to 1.20.5
PaperMC/Paper@f2c45ed do some work
PaperMC/Paper@00c14f2 Move logging patches after adventure
PaperMC/Paper@ef057bb work on Adventure patch
PaperMC/Paper@380c4d2 Add plugin remapping patches
PaperMC/Paper@7cdf804 Work
PaperMC/Paper@dd6ce09 Fix reflection diff and order wrt commodore diff
PaperMC/Paper@598a1cb Apply shadow removal patch
PaperMC/Paper@ffccfd5 Apply timings
PaperMC/Paper@eb41348 33
PaperMC/Paper@9cac5b6 Fix continueServerUpdate with 2-line subjects
PaperMC/Paper@2eeed9e 41
PaperMC/Paper@d07c487 Don't use defaultToolchain method for run tasks
PaperMC/Paper@f2350fe Set mercury sourceCompat
PaperMC/Paper@5cfd92b Fix api compile
PaperMC/Paper@862d004 work on some API stuff
PaperMC/Paper@d6a3c0c fix 2 of our javadoc errors
PaperMC/Paper@487555b update
PaperMC/Paper@0225537 Update upstream
PaperMC/Paper@906f906 Patches!
PaperMC/Paper@8244815 221
PaperMC/Paper@309ebc1 253
PaperMC/Paper@1d7d7e9 301
PaperMC/Paper@9079c90 354
PaperMC/Paper@cc46148 405
PaperMC/Paper@5be858e Patches!
PaperMC/Paper@2d9d0d8 Patches!
PaperMC/Paper@a403a8d Patches!!!!!!!
PaperMC/Paper@21afc0a Patches!!!!!!!
PaperMC/Paper@1de0dc8 666 plus 1
PaperMC/Paper@4e654f2 More patch work
PaperMC/Paper@e832328 Check for existing am session before running continueServerUpdate
PaperMC/Paper@fc5c0da 683
PaperMC/Paper@90095cd 694
PaperMC/Paper@71ae391 more work (721)
PaperMC/Paper@22227cc more more work (757)
PaperMC/Paper@4d9e824 more more work (806)
PaperMC/Paper@9617829 Restore original formatting for MC-252817 patch
PaperMC/Paper@0518559 Update reflection rewriter to 0.0.1 release
PaperMC/Paper@e0a245d Patches!!!!!!!
PaperMC/Paper@1104431 955
PaperMC/Paper@1df7e21 Apply more API-implementing patches
PaperMC/Paper@b733809 Drop conduit api patch (upstream implemented same api with same method signatures)
PaperMC/Paper@c95db4f adventure 4.17.0-SNAPSHOT
PaperMC/Paper@bb1351c some work on adventure
PaperMC/Paper@1444b36 work on adventure
PaperMC/Paper@ce0e78c compile fixes
PaperMC/Paper@25f7c68 compile fixes
PaperMC/Paper@690b1cd compile fixes
PaperMC/Paper@b673721 compile fixes
PaperMC/Paper@6a87d14 dataconverter
PaperMC/Paper@ec9f7e3 starlight
PaperMC/Paper@e9eec78 chunk system
PaperMC/Paper@f6ea373 Patches
PaperMC/Paper@ec4ada8 Apply and move up non-optimization patches
PaperMC/Paper@c9907c6 More patches
PaperMC/Paper@2debcaf More more patches, including hopper optimization patch
PaperMC/Paper@6da0d8c (Almost) all patches applied
PaperMC/Paper@345b5c1 Patches!!!!!!! (we are done)
PaperMC/Paper@4590038 Fix properly resend patches
PaperMC/Paper@457e2c8 pass more stuff
PaperMC/Paper@b8da9ac item meta patch work
PaperMC/Paper@ccf158a update smithing recipe copy data components API
PaperMC/Paper@653f043 readd fix bee aging patch
PaperMC/Paper@bab31b6 Update Enchantment damage increase API
PaperMC/Paper@f4c7639 Un-jankify root user detection
PaperMC/Paper@9c58056 Some more compilation fixes
PaperMC/Paper@b984f66 Missing FQN in CraftPotionBrewer getter
PaperMC/Paper@768befe Remove patch renaming scripts
PaperMC/Paper@04a25c2 Fix WorldCreator#keepSpawnLoaded
PaperMC/Paper@820f999 Fixes for cb pkg ver
PaperMC/Paper@ca9001a compile fixes
PaperMC/Paper@d01f6b2 Fix more compile issues
PaperMC/Paper@8d3759d More more compile fixes
PaperMC/Paper@ed79038 More compile fixes
PaperMC/Paper@2641c02 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@68aea43 Fixup damage source change
PaperMC/Paper@3062eb2 address my own comments
PaperMC/Paper@e85e1ec fixup sus effect entry patches
PaperMC/Paper@10e6143 fixup adventure's book meta handling
PaperMC/Paper@a244281 Replace VanillaGradle use and update generated API
PaperMC/Paper@31ad90b some more compile fixes
PaperMC/Paper@d2ef062 generator fix
PaperMC/Paper@7c6411b compile fixes
PaperMC/Paper@867eb90 compile fixes
PaperMC/Paper@62b96c5 compile fixes
PaperMC/Paper@c5c2a5f hunk system fixes
PaperMC/Paper@bcdf1f9 fixup loom pattern select event patch
PaperMC/Paper@43d110e fix issue with item default attribute API
PaperMC/Paper@2997fd6 plugin manager updates
PaperMC/Paper@7e9da43 support patch versions in api-version
PaperMC/Paper@813cfbf Fix compile issues
PaperMC/Paper@478a971 Fix light setting in protochunk
PaperMC/Paper@8b28f9f Fix accumulated total ticking chunks not being updated
PaperMC/Paper@00dac83 Drop old decompile fix
PaperMC/Paper@f6fae41 fix chat_type issue
PaperMC/Paper@cc81668 fix some issues on the todo list
PaperMC/Paper@44e68c3 fix some more issues
PaperMC/Paper@1bc278b Update patched spigot decompiler to fix inconsistency based on processing order
PaperMC/Paper@19ac9d4 remove no longer needed patches and fix tests
PaperMC/Paper@e856d17 Update paper plugin check in PluginRemapper
PaperMC/Paper@882ea0a fix adventure translations
PaperMC/Paper@4c53ace fix exact choice recipes
PaperMC/Paper@464cc81 fix custom potion mixes
PaperMC/Paper@ff77f82 paperweight 1.6.0
PaperMC/Paper@6a4974b Remove shadow from build classpath
PaperMC/Paper@c38f96b deprecate our ItemRarity API
PaperMC/Paper@ba8512a fix javadocs for SpawnerEntry$Equipment API
PaperMC/Paper@f1fc1b3 readd old UUID format patch
PaperMC/Paper@5485043 Don't tell people to build the reobf jar
PaperMC/Paper@2f19f0f fix enchantment order issue
PaperMC/Paper@80bd015 fix adventure converters not using RegistryOps
PaperMC/Paper@68e23db add back missing call to profile fill events
PaperMC/Paper@9bac389 more fixes
PaperMC/Paper@81f4405 add back hunk to async SavedData IO
PaperMC/Paper@91b5de6 bunch of fixes and improvements
PaperMC/Paper@f85d423 improve dumpitem and pgive commands
PaperMC/Paper@5731f34 Restore Handle Large Packets Disconnecting Client Patch
PaperMC/Paper@f037f08 Unify plugin remapping debug flags
PaperMC/Paper@c82766d fix item flags
PaperMC/Paper@f933c35 Update DataConverter to 1.20.6-rc1
PaperMC/Paper@55b1a87 fix PotionEffectType#getEffectAttributes
PaperMC/Paper@0b1b1fe fix helmet damage reduction inconsistencies
PaperMC/Paper@e2552ee Start cleaning up plugin remapping patches
PaperMC/Paper@711dbd7 Bump adventure ansi serializer
PaperMC/Paper@af97400 update generator
PaperMC/Paper@b7e148a Move obfhelper/stack deobf diff into original patch
PaperMC/Paper@a390119 Move cb version definition to gradle patch
PaperMC/Paper@20af7a7 remove funny diff
PaperMC/Paper@b3ea907 more ItemFlag fixes
PaperMC/Paper@53d8edd properly check for experimental stuff in generator
PaperMC/Paper@a771940 Revert to vanilla handling of LivingEntity#actuallyHurt (#10463)
PaperMC/Paper@06cae13 Update jdk version and distribution in actions
PaperMC/Paper@dd571d8 Fix bad diff in build gradle file
PaperMC/Paper@d02bb81 proper migration to gamerules for keep spawn loaded distance
PaperMC/Paper@aeb3f37 update paperweight to 1.6.1
PaperMC/Paper@75c22d5 Bump tiny-remapper
PaperMC/Paper@8454786 Bump tiny-remapper (real)
PaperMC/Paper@d99d84a Temporarily comment out adventure jd links
PaperMC/Paper@83767f9 Use JetBrains runtime for run tasks
PaperMC/Paper@4ad6022 improve checking handled tags in itemmeta (#9470)
PaperMC/Paper@8ce62b3 Fix issue with hopppers
PaperMC/Paper@7e3d5b5 bump paperweight to 1.6.2 to fix spurious build failure from scanJar OOM
PaperMC/Paper@d964c15 fix last test issue
PaperMC/Paper@3e90a19 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@d93c6f9 remove calls to DoNotUse methods
PaperMC/Paper@f187fd6 Only scan `org.bukkit.craftbukkit.inventory` in `MetaHandledTagsTest`
PaperMC/Paper@a3c4dc9 Fix the incorrect codec usage in the Style convert (#10465)
PaperMC/Paper@e16263c Fix firework meta NPE
PaperMC/Paper@306b203 more fixes for ItemMeta relating to components
PaperMC/Paper@1a03cc9 Fix test compilation
PaperMC/Paper@6e31f38 Fix book meta lacking resolved tag from older versions (Fixes #10470)
PaperMC/Paper@37b3891 Fix another missing book meta tag
PaperMC/Paper@c4a1cd1 Fix issue with empty lists in adventure predicates
PaperMC/Paper@9d6e7e3 Don't hard fail on plugin remap error
PaperMC/Paper@4491ac0 respect hard list size limits in ItemMeta
PaperMC/Paper@aed7dca Fix overly strong name validation in player heads
PaperMC/Paper@0f4d328 final missing validation for data components
PaperMC/Paper@52ff3b7 Add itemName components (Resolves #10467) (#10471)
PaperMC/Paper@ba673a3 [ci skip] Feature requests are now in GitHub Discussions (#10606)
PaperMC/Paper@0f3e324 [ci skip] Fix discussion template file name (#10607)
PaperMC/Paper@82a8012 [ci skip] adjust projects workflow for label changes
PaperMC/Paper@61c9c07 Fix CraftMetaBlockState adding extra tags
PaperMC/Paper@7f2d531 Rewrite reflection in library loader jars (#10608)
PaperMC/Paper@05308fc Remap plugin libraries with namespace set to spigot (#10610)
PaperMC/Paper@69a971a Reset component prototype on itemtype change
PaperMC/Paper@f9397e1 Fix incorrect Commodore mapping of sweeping enchant
PaperMC/Paper@8f7ac62 Validate manifest provided mapping namespace (#10612)
PaperMC/Paper@fbe3c00 [ci skip] update projects workflow configuration
PaperMC/Paper@44ee092 1.20.6 (#10623)
PaperMC/Paper@812ccb9 fix spawnChunkRadius gamerule resetting
PaperMC/Paper@25e44bc fix dumpitem command nbt format
PaperMC/Paper@3fdd094 Fix sealed package check in BytecodeModifyingURLClassLoader (#10627)
PaperMC/Paper@937a67a Add initial size cap to component map
PaperMC/Paper@4ea67ab [ci skip] Remove trailing comma in projects action
PaperMC/Paper@8c058f8 Update paperweight to 1.6.3 (#10626)
PaperMC/Paper@fa6013d Fixes beds not exploding in the nether
PaperMC/Paper@3e0eb4a Updated Upstream (CraftBukkit) (#10624)
PaperMC/Paper@4cfd9e2 Expose canReach to mob pathfinding API (#10636)
PaperMC/Paper@b8c454c Add damage check for mending (#10631)
PaperMC/Paper@310b47b Update Java version references, add note on var usages
PaperMC/Paper@faa7aa2 Add GameMode#isInvulnerable (#10633)
PaperMC/Paper@18c201b Add EquipmentSlot#getOppositeHand (#10632)
PaperMC/Paper@544ce20 Expose #hasColor to leather armor (#10638)
PaperMC/Paper@59fe7cc default save-empty-scoreboard-teams to vanilla
PaperMC/Paper@0db72ac Fix can_place_on conversion and size check for item containers
PaperMC/Paper@156675c Fix lodestone compass target conversion
PaperMC/Paper@5632210 add RegistryAccess for managing registries (#10154)
PaperMC/Paper@6fcca46 Add missing step in V3818
PaperMC/Paper@7401313 fix shear drops for wolf and bogged
PaperMC/Paper@7ae2c67 Keep components using single items in creative (#10664)
PaperMC/Paper@b13c7db Add missing experimental field and annotations (#10653)
PaperMC/Paper@9d8d38d Updated Upstream (CraftBukkit) (#10646)
PaperMC/Paper@0e43d3c Added API to get player's proxy address (#10400)
PaperMC/Paper@54c5ecb Add missing SpigotConfig logCommands check (#10659)
PaperMC/Paper@816ea9e [ci skip] Update old particle reference in javadoc (#10652)
PaperMC/Paper@716dfd8 Fix EntityLoadCrossbowEvent (#10645)
PaperMC/Paper@21d91ce Prevent profile lookups when unnecessary (#10651)
PaperMC/Paper@2a6a5fe Add a way to check whether the chest is blocked (#10635)
PaperMC/Paper@ac3a547 Fix BlockStateMeta (#10647)
2024-05-06 02:54:19 +01:00

42 lines
2.0 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samsuik <40902469+Samsuik@users.noreply.github.com>
Date: Mon, 16 Oct 2023 22:41:12 +0100
Subject: [PATCH] Cache MovingBlockEntity collision shape
diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
index b35f476e26a020cf75e53a5eb488717d996a6935..d555ad1dd2f648b84920eceec6cc99e8801334b3 100644
--- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
@@ -42,6 +42,11 @@ public class PistonMovingBlockEntity extends BlockEntity {
private float progressO;
private long lastTicked;
private int deathTicks;
+ // Sakura start
+ private VoxelShape collisionShape = Shapes.empty();
+ private Direction shapeDirection = null;
+ private float shapeProgress = Float.MIN_VALUE;
+ // Sakura end
public PistonMovingBlockEntity(BlockPos pos, BlockState state) {
super(BlockEntityType.PISTON, pos, state);
@@ -349,6 +354,18 @@ public class PistonMovingBlockEntity extends BlockEntity {
}
public VoxelShape getCollisionShape(BlockGetter world, BlockPos pos) {
+ // Sakura start
+ var direction = NOCLIP.get();
+ if (progress == shapeProgress && direction == shapeDirection) {
+ return collisionShape;
+ } else {
+ shapeProgress = progress;
+ shapeDirection = direction;
+ return collisionShape = createCollisionShape(world, pos);
+ }
+ }
+ private VoxelShape createCollisionShape(BlockGetter world, BlockPos pos) {
+ // Sakura end
VoxelShape voxelShape;
if (!this.extending && this.isSourcePiston && this.movedState.getBlock() instanceof PistonBaseBlock) {
voxelShape = this.movedState.setValue(PistonBaseBlock.EXTENDED, Boolean.valueOf(true)).getCollisionShape(world, pos);