diff options
| author | Jason Penilla <[email protected]> | 2024-10-27 11:26:21 -0700 |
|---|---|---|
| committer | Jason Penilla <[email protected]> | 2024-10-27 11:26:21 -0700 |
| commit | f8f230a0d0e8cdff82be2b10bce947adfe4f0f2d (patch) | |
| tree | e3dbbd050a03cf0497f88758c3052f0abae8a419 /patches/server/0936-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch | |
| parent | 4d873026726a150bcfe5cc6924bdd4dc8510d909 (diff) | |
| download | Paper-f8f230a0d0e8cdff82be2b10bce947adfe4f0f2d.tar.gz Paper-f8f230a0d0e8cdff82be2b10bce947adfe4f0f2d.zip | |
Remove unnecessary AT
Diffstat (limited to 'patches/server/0936-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch')
| -rw-r--r-- | patches/server/0936-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/patches/server/0936-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch b/patches/server/0936-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch index a4d1c6d91e..2070223780 100644 --- a/patches/server/0936-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch +++ b/patches/server/0936-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch @@ -18,9 +18,6 @@ return value anymore and some dispense behaviors like equippable and regular items will not have a defined behavior in that map and might throw a NPE in that case. -== AT == -public net.minecraft.world.level.block.DispenserBlock getDispenseMethod(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/core/dispenser/DispenseItemBehavior; - diff --git a/src/main/java/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java index 36180e80dbd681e68c60e097015dad890a48b574..dff30954e4c588ee4cc79d3f6dab6fb456934d65 100644 --- a/src/main/java/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java @@ -278,7 +275,7 @@ index f84987c36a16df19286d6f1badfb1ffb9cc7e770..cc85e96035f7cb2e6493b1cc47480311 idispensebehavior.dispense(pointer, eventStack); return stack; diff --git a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java -index 9f99a9ec8f8269a0aeee2d6aa68f8a344f5f64b6..716d1a98775d7338a121af9fd0868a65e2c28288 100644 +index a02f24448b002824b068278fa427003008c0d0f1..500c56c4ef0878434582a50d6dba2ccca9773275 100644 --- a/src/main/java/net/minecraft/world/level/block/DispenserBlock.java +++ b/src/main/java/net/minecraft/world/level/block/DispenserBlock.java @@ -116,6 +116,12 @@ public class DispenserBlock extends BaseEntityBlock { @@ -291,7 +288,7 @@ index 9f99a9ec8f8269a0aeee2d6aa68f8a344f5f64b6..716d1a98775d7338a121af9fd0868a65 + } + // Paper end - Fix NPE with equippable and items without behavior + - public DispenseItemBehavior getDispenseMethod(Level world, ItemStack stack) { + protected DispenseItemBehavior getDispenseMethod(Level world, ItemStack stack) { if (!stack.isItemEnabled(world.enabledFeatures())) { return DispenserBlock.DEFAULT_BEHAVIOR; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java |