mirror of
https://github.com/PaperMC/Paper.git
synced 2025-04-12 08:57:39 +02:00
Drop unneeded desync patch
spigot no longer even fires the event for this case, so, this may actually be a regression, not too sure here, but, as-is this patch is dead
This commit is contained in:
parent
d3caeeb6c2
commit
c6ea84c7fa
255 changed files with 11 additions and 30 deletions
patches/server
0623-Expose-protocol-version.patch0623-fix-cancelling-block-falling-causing-client-desync.patch0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch0625-Enhance-console-tab-completions-for-brigadier-comman.patch0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch0627-Add-bypass-host-check.patch0628-Set-area-affect-cloud-rotation.patch0629-add-isDeeplySleeping-to-HumanEntity.patch0630-Fix-duplicating-give-items-on-item-drop-cancel.patch0631-add-consumeFuel-to-FurnaceBurnEvent.patch0632-add-get-set-drop-chance-to-EntityEquipment.patch0633-fix-PigZombieAngerEvent-cancellation.patch0634-Fix-checkReach-check-for-Shulker-boxes.patch0635-fix-PlayerItemHeldEvent-firing-twice.patch0636-Added-PlayerDeepSleepEvent.patch0637-More-World-API.patch0638-Added-PlayerBedFailEnterEvent.patch0639-Implement-methods-to-convert-between-Component-and-B.patch0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch0641-Introduce-beacon-activation-deactivation-events.patch0642-add-RespawnFlags-to-PlayerRespawnEvent.patch0643-Add-Channel-initialization-listeners.patch0644-Send-empty-commands-if-tab-completion-is-disabled.patch0645-Add-more-WanderingTrader-API.patch0646-Add-EntityBlockStorage-clearEntities.patch0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch0649-Inventory-close.patch0650-call-PortalCreateEvent-players-and-end-platform.patch0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch0652-Fix-CraftPotionBrewer-cache.patch0653-Add-basic-Datapack-API.patch0654-Add-environment-variable-to-disable-server-gui.patch0655-additions-to-PlayerGameModeChangeEvent.patch0656-ItemStack-repair-check-API.patch0657-More-Enchantment-API.patch0658-Fix-and-optimise-world-force-upgrading.patch0659-Add-Mob-lookAt-API.patch0660-Add-Unix-domain-socket-support.patch0661-Add-EntityInsideBlockEvent.patch0662-Attributes-API-for-item-defaults.patch0663-Add-cause-to-Weather-ThunderChangeEvents.patch0664-More-Lidded-Block-API.patch0665-Limit-item-frame-cursors-on-maps.patch0666-Add-PlayerKickEvent-causes.patch0667-Add-PufferFishStateChangeEvent.patch0668-Fix-PlayerBucketEmptyEvent-result-itemstack.patch0669-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch0670-Add-option-to-fix-items-merging-through-walls.patch0671-Add-BellRevealRaiderEvent.patch0672-Fix-invulnerable-end-crystals.patch0673-Add-ElderGuardianAppearanceEvent.patch0674-Fix-dangerous-end-portal-logic.patch0675-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch0676-Make-item-validations-configurable.patch0677-Line-Of-Sight-Changes.patch0678-add-per-world-spawn-limits.patch0679-Fix-PotionSplashEvent-for-water-splash-potions.patch0680-Add-more-LimitedRegion-API.patch0681-Fix-PlayerDropItemEvent-using-wrong-item.patch0682-Missing-Entity-Behavior-API.patch0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch0685-Use-getChunkIfLoadedImmediately-in-places.patch0686-Fix-commands-from-signs-not-firing-command-events.patch0687-Adds-PlayerArmSwingEvent.patch0688-Fixes-kick-event-leave-message-not-being-sent.patch0689-Add-config-for-mobs-immune-to-default-effects.patch0690-Fix-incorrect-message-for-outdated-client.patch0691-Don-t-apply-cramming-damage-to-players.patch0692-Rate-options-and-timings-for-sensors-and-behaviors.patch0693-Add-a-bunch-of-missing-forceDrop-toggles.patch0694-Stinger-API.patch0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch0696-Add-System.out-err-catcher.patch0697-Fix-test-not-bootstrapping.patch0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch0699-Improve-boat-collision-performance.patch0700-Prevent-AFK-kick-while-watching-end-credits.patch0701-Allow-skipping-writing-of-comments-to-server.propert.patch0702-Add-PlayerSetSpawnEvent.patch0703-Make-hoppers-respect-inventory-max-stack-size.patch0704-Optimize-entity-tracker-passenger-checks.patch0705-Config-option-for-Piglins-guarding-chests.patch0706-Added-EntityDamageItemEvent.patch0707-Optimize-indirect-passenger-iteration.patch0708-Fix-block-drops-position-losing-precision-millions-o.patch0709-Configurable-item-frame-map-cursor-update-interval.patch0710-Make-EntityUnleashEvent-cancellable.patch0711-Clear-bucket-NBT-after-dispense.patch0712-Respect-despawn-rate-in-item-merge-check.patch0713-Change-EnderEye-target-without-changing-other-things.patch0714-Add-BlockBreakBlockEvent.patch0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch0716-More-CommandBlock-API.patch0717-Add-missing-team-sidebar-display-slots.patch0718-Add-back-EntityPortalExitEvent.patch0719-Add-methods-to-find-targets-for-lightning-strikes.patch0720-Get-entity-default-attributes.patch0721-Left-handed-API.patch
|
@ -1,19 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Trigary <trigary0@gmail.com>
|
||||
Date: Sat, 27 Mar 2021 11:13:30 +0100
|
||||
Subject: [PATCH] fix cancelling block falling causing client desync
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
|
||||
index 483127e9418489ad7ba1fbcb14a045d91c1c3c30..880521f25a6c8483c79043f237866cb7a49c3a54 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
|
||||
@@ -192,7 +192,7 @@ public class FallingBlockEntity extends Entity {
|
||||
|
||||
// CraftBukkit start
|
||||
if (CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, this.blockState).isCancelled()) {
|
||||
- this.discard(); // SPIGOT-6586 called before the event in previous versions
|
||||
+ this.discard(); // SPIGOT-6586 called before the event in previous versions //TODO test if desync happens on cancel
|
||||
return;
|
||||
}
|
||||
// CraftBukkit end
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue