Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix max nearby entities class check (#9967)

Browse Source
This commit is contained in:
TonytheMacaroni 2023-11-25 16:48:32 -05:00
parent 79599cfd22
commit 32f58b8106
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/Add-slot-sanity-checks-in-container-clicks.patch
View File

@ -34,9 +34,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
itemstack = this.getCarried();
if (AbstractContainerMenu.canItemQuickReplace(slot, itemstack, true) && slot.mayPlace(itemstack) && (this.quickcraftType == 2 || itemstack.getCount() > this.quickcraftSlots.size()) && this.canDragTo(slot)) {
@@ -0,0 +0,0 @@ public abstract class AbstractContainerMenu {
Slot slot2;
int j2;
if (actionType == ClickType.SWAP) {
- if (actionType == ClickType.SWAP) {
+ if (actionType == ClickType.SWAP && (button == 40 || button >= 0 && button < 9)) { // Paper
+ if (slotIndex < 0 || button < 0) return; // Paper
slot2 = (Slot) this.slots.get(slotIndex);
itemstack1 = playerinventory.getItem(button);

7
patches/server/Fix-a-bunch-of-vanilla-bugs.patch
View File

@ -66,6 +66,9 @@ https://bugs.mojang.com/browse/MC-174630
https://bugs.mojang.com/browse/MC-153086
Fix the beacon deactivation sound always playing when broken
https://bugs.mojang.com/browse/MC-259321
Fix spawners checking max nearby entities with correct type
== AT ==
public net/minecraft/world/entity/Mob leashInfoTag
@ -408,8 +411,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return new net.minecraft.world.level.entity.EntityTypeTest<>() {
+ @Nullable
+ @Override
+ public T tryCast(B clazz) {
+ return (T)(clazz.equals(clazz.getClass()) ? clazz : null);
+ public T tryCast(B entity) {
+ return (T)(clazz.equals(entity.getClass()) ? entity : null);
+ }
+
+ @Override