Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#1233: Remove some old MC bug fixes now fixed in vanilla

Browse Source
This commit is contained in:
Owen1212055 2023-07-24 18:09:23 +10:00 committed by md_5
parent 08ec344ad1
commit 7cf863de17
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch
View File

@ -42,15 +42,6 @@
this.onItemPickup(entityitem); this.onItemPickup(entityitem);
this.setItemSlot(EnumItemSlot.MAINHAND, itemstack); this.setItemSlot(EnumItemSlot.MAINHAND, itemstack);
this.setGuaranteedDrop(EnumItemSlot.MAINHAND); this.setGuaranteedDrop(EnumItemSlot.MAINHAND);
@@ -389,7 +406,7 @@
@Override
public boolean canUse() {
- return this.dolphin.gotFish() && this.dolphin.getAirSupply() >= 100;
+ return this.dolphin.gotFish() && this.dolphin.getAirSupply() >= 100 && this.dolphin.level().getWorld().canGenerateStructures(); // MC-151364, SPIGOT-5494: hangs if generate-structures=false
}
@Override
@@ -489,7 +506,7 @@ @@ -489,7 +506,7 @@
@Override @Override

13
nms-patches/net/minecraft/world/item/ItemCrossbow.patch
View File

@ -1,17 +1,6 @@
--- a/net/minecraft/world/item/ItemCrossbow.java --- a/net/minecraft/world/item/ItemCrossbow.java
+++ b/net/minecraft/world/item/ItemCrossbow.java +++ b/net/minecraft/world/item/ItemCrossbow.java
@@ -113,6 +113,10 @@ @@ -236,11 +236,27 @@
if (itemstack1.isEmpty() && flag) {
itemstack1 = new ItemStack(Items.ARROW);
itemstack2 = itemstack1.copy();
+ // CraftBukkit start - SPIGOT-4870, MC-150847
+ } else if (itemstack1.isEmpty()) {
+ return false;
+ // CraftBukkit end
}
if (!loadProjectile(entityliving, itemstack, itemstack1, k > 0, flag)) {
@@ -236,11 +240,27 @@
((IProjectile) object).shoot((double) vector3f.x(), (double) vector3f.y(), (double) vector3f.z(), f1, f2); ((IProjectile) object).shoot((double) vector3f.x(), (double) vector3f.y(), (double) vector3f.z(), f1, f2);
} }