1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-21 22:48:57 +01:00

Drop no longer needed patch

This commit is contained in:
Nassim Jahnke 2023-09-24 13:09:52 +10:00
parent 2ec643a53c
commit 8d922746d9
No known key found for this signature in database
GPG key ID: EF6771C01F6EF02F
102 changed files with 1 additions and 37 deletions
build.gradle.kts
patches/server
0928-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch0928-Optimize-Hoppers.patch0929-Fix-beehives-generating-from-using-bonemeal.patch0930-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch0931-Treat-sequence-violations-like-they-should-be.patch0932-remove-duplicate-animate-packet-for-records.patch0933-Prevent-causing-expired-keys-from-impacting-new-join.patch0934-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch0935-Use-array-for-gamerule-storage.patch0936-Fix-a-couple-of-upstream-bed-issues.patch0937-Fix-demo-flag-not-enabling-demo-mode.patch0938-Add-Mob-Experience-reward-API.patch0939-Break-redstone-on-top-of-trap-doors-early.patch0940-Fix-DamageCause-for-Falling-Blocks.patch0941-Avoid-Lazy-Initialization-for-Enum-Fields.patch0942-More-accurate-isInOpenWater-impl.patch0943-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch0944-Optimise-recalcBlockCounts-for-empty-sections.patch0945-Expand-PlayerItemMendEvent.patch0946-Refresh-ProjectileSource-for-projectiles.patch0947-Add-transient-modifier-API.patch0948-Fix-block-place-logic.patch0949-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch0950-Ignore-inline-definitions-of-trim-material-pattern.patch0951-Call-BlockGrowEvent-for-missing-blocks.patch0952-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch0953-fix-MapLike-spam-for-missing-key-selector.patch0954-Fix-sniffer-removeExploredLocation.patch0955-Add-method-to-remove-all-active-potion-effects.patch0956-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch0957-Fix-incorrect-crafting-result-amount-for-fireworks.patch0958-Properly-Cancel-Usable-Items.patch0959-Add-event-for-player-editing-sign.patch0960-Only-tick-item-frames-if-players-can-see-it.patch0961-Improve-command-function-perm-level-checks.patch0962-Add-option-to-disable-block-updates.patch0963-Call-missing-BlockDispenseEvent.patch0964-Don-t-load-chunks-for-supporting-block-checks.patch0965-Optimize-player-lookups-for-beacons.patch0966-Add-Sign-getInteractableSideFor.patch0967-Array-backed-synched-entity-data.patch0968-fix-item-meta-for-tadpole-buckets.patch0969-Suppress-Item-Meta-Validation-Checks.patch0970-Fix-BanList-API.patch0971-Determine-lava-and-water-fluid-explosion-resistance-.patch0972-Fix-possible-NPE-on-painting-creation.patch0973-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch0974-ExperienceOrb-should-call-EntitySpawnEvent.patch0975-Don-t-tick-signs.patch0976-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch0977-Add-whitelist-events.patch0978-Implement-PlayerFailMoveEvent.patch0979-Folia-scheduler-and-owned-region-API.patch0980-Only-erase-allay-memory-on-non-item-targets.patch0981-API-for-updating-recipes-on-clients.patch0982-Fix-rotation-when-spawning-display-entities.patch0983-Only-capture-actual-tree-growth.patch0984-Use-correct-source-for-mushroom-block-spread-event.patch0985-Respect-randomizeData-on-more-entities-when-spawning.patch0986-Use-correct-seed-on-api-world-load.patch0987-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch0988-Cache-map-ids-on-item-frames.patch0989-Fix-custom-statistic-criteria-creation.patch0990-Bandaid-fix-for-Effect.patch0991-SculkCatalyst-bloom-API.patch0992-API-for-an-entity-s-scoreboard-name.patch0993-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch0994-Deprecate-and-replace-methods-with-old-StructureType.patch0995-Don-t-tab-complete-namespaced-commands-if-send-names.patch0996-Properly-handle-BlockBreakEvent-isDropItems.patch0997-Fire-entity-death-event-for-ender-dragon.patch0998-Configurable-entity-tracking-range-by-Y-coordinate.patch0999-Add-Listing-API-for-Player.patch1000-Configurable-Region-Compression-Format.patch1001-Expose-clicked-BlockFace-during-BlockDamageEvent.patch1002-Fix-NPE-on-Boat-getStatus.patch1003-Expand-Pose-API.patch1004-More-DragonBattle-API.patch1005-Deep-clone-unhandled-nbt-tags.patch1006-Add-PlayerPickItemEvent.patch1007-Improve-performance-of-mass-crafts.patch1008-Allow-trident-custom-damage.patch1009-Expose-hand-during-BlockCanBuildEvent.patch1010-Optimize-nearest-structure-border-iteration.patch1011-Implement-OfflinePlayer-isConnected.patch1012-Fix-inventory-desync.patch1013-Add-titleOverride-to-InventoryOpenEvent.patch1014-Configure-sniffer-egg-hatch-time.patch1015-Do-crystal-portal-proximity-check-before-entity-look.patch1016-Skip-POI-finding-if-stuck-in-vehicle.patch1017-Add-slot-sanity-checks-in-container-clicks.patch1018-Call-BlockRedstoneEvents-for-lecterns.patch1019-Allow-proper-checking-of-empty-item-stacks.patch1020-Fix-silent-equipment-change-for-mobs.patch1021-Fix-spigot-s-Forced-Stats.patch1022-Add-missing-InventoryHolders-to-inventories.patch1023-Do-not-read-tile-entities-in-chunks-that-are-positio.patch1024-Actually-optimise-explosions.patch1025-Add-missing-logs-for-log-ips-config-option.patch

View file

@ -133,7 +133,7 @@ allprojects {
tasks.collectAtsFromPatches {
// Uncomment while updating for a new Minecraft version
extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
// extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
}
// Uncomment while updating for a new Minecraft version

View file

@ -1,36 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sat, 18 Mar 2023 18:51:33 +0100
Subject: [PATCH] Fix chiseled bookshelf and jukebox setItem with air
diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java
index 15ef84c39a1a77cd9e33efee670bd0967c52657c..dda68d157d4da6e379567b25810051b652ec122f 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java
@@ -149,7 +149,7 @@ public class ChiseledBookShelfBlockEntity extends BlockEntity implements Contain
@Override
public void setItem(int slot, ItemStack stack) {
- if (stack.is(ItemTags.BOOKSHELF_BOOKS)) {
+ if (stack.isEmpty() || stack.is(ItemTags.BOOKSHELF_BOOKS)) { // Paper
this.items.set(slot, stack);
if (level != null) this.updateState(slot); // CraftBukkit - SPIGOT-7381: check for null world
} else if (stack.isEmpty()) {
diff --git a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java
index 2c1edc6dfc7fd1a8af977919ce31913365cf3ddd..6c9b3fb1a015320da207c6b724cc18fb6b80267a 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java
@@ -183,6 +183,12 @@ public class JukeboxBlockEntity extends BlockEntity implements Clearable, Contai
@Override
public void setItem(int slot, ItemStack stack) {
+ // Paper start
+ if (stack.isEmpty()) {
+ this.removeItem(slot, 0);
+ return;
+ }
+ // Paper end
if (stack.is(ItemTags.MUSIC_DISCS) && this.level != null) {
this.items.set(slot, stack);
this.setHasRecordBlockState((Entity) null, true);

Some files were not shown because too many files have changed in this diff Show more