mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 11:44:19 +01:00
80 lines
3.7 KiB
Diff
80 lines
3.7 KiB
Diff
--- a/net/minecraft/world/entity/animal/EntitySheep.java
|
|
+++ b/net/minecraft/world/entity/animal/EntitySheep.java
|
|
@@ -64,6 +64,14 @@
|
|
import net.minecraft.world.level.storage.loot.LootTable;
|
|
import net.minecraft.world.level.storage.loot.LootTables;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.world.inventory.InventoryCraftResult;
|
|
+import net.minecraft.world.item.Item;
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.event.entity.SheepRegrowWoolEvent;
|
|
+import org.bukkit.inventory.InventoryView;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntitySheep extends EntityAnimal implements IShearable {
|
|
|
|
private static final int EAT_ANIMATION_TICKS = 40;
|
|
@@ -251,6 +259,11 @@
|
|
|
|
if (itemstack.is(Items.SHEARS)) {
|
|
if (!this.level().isClientSide && this.readyForShearing()) {
|
|
+ // CraftBukkit start
|
|
+ if (!CraftEventFactory.handlePlayerShearEntityEvent(entityhuman, this, itemstack, enumhand)) {
|
|
+ return EnumInteractionResult.PASS;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.shear(SoundCategory.PLAYERS);
|
|
this.gameEvent(GameEvent.SHEAR, entityhuman);
|
|
itemstack.hurtAndBreak(1, entityhuman, getSlotForHand(enumhand));
|
|
@@ -270,7 +283,9 @@
|
|
int i = 1 + this.random.nextInt(3);
|
|
|
|
for (int j = 0; j < i; ++j) {
|
|
+ this.forceDrops = true; // CraftBukkit
|
|
EntityItem entityitem = this.spawnAtLocation((IMaterial) EntitySheep.ITEM_BY_DYE.get(this.getColor()), 1);
|
|
+ this.forceDrops = false; // CraftBukkit
|
|
|
|
if (entityitem != null) {
|
|
entityitem.setDeltaMovement(entityitem.getDeltaMovement().add((double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F), (double) (this.random.nextFloat() * 0.05F), (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F)));
|
|
@@ -363,6 +378,12 @@
|
|
|
|
@Override
|
|
public void ate() {
|
|
+ // CraftBukkit start
|
|
+ SheepRegrowWoolEvent event = new SheepRegrowWoolEvent((org.bukkit.entity.Sheep) this.getBukkitEntity());
|
|
+ this.level().getCraftServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled()) return;
|
|
+ // CraftBukkit end
|
|
super.ate();
|
|
this.setSheared(false);
|
|
if (this.isBaby()) {
|
|
@@ -382,7 +403,7 @@
|
|
EnumColor enumcolor = ((EntitySheep) entityanimal).getColor();
|
|
EnumColor enumcolor1 = ((EntitySheep) entityanimal1).getColor();
|
|
InventoryCrafting inventorycrafting = makeContainer(enumcolor, enumcolor1);
|
|
- Optional optional = this.level().getRecipeManager().getRecipeFor(Recipes.CRAFTING, inventorycrafting, this.level()).map((recipeholder) -> {
|
|
+ Optional<Item> optional = this.level().getRecipeManager().getRecipeFor(Recipes.CRAFTING, inventorycrafting, this.level()).map((recipeholder) -> { // CraftBukkit - decompile error
|
|
return ((RecipeCrafting) recipeholder.value()).assemble(inventorycrafting, this.level().registryAccess());
|
|
}).map(ItemStack::getItem);
|
|
|
|
@@ -405,10 +426,18 @@
|
|
public boolean stillValid(EntityHuman entityhuman) {
|
|
return false;
|
|
}
|
|
+
|
|
+ // CraftBukkit start
|
|
+ @Override
|
|
+ public InventoryView getBukkitView() {
|
|
+ return null; // TODO: O.O
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}, 2, 1);
|
|
|
|
transientcraftingcontainer.setItem(0, new ItemStack(ItemDye.byColor(enumcolor)));
|
|
transientcraftingcontainer.setItem(1, new ItemStack(ItemDye.byColor(enumcolor1)));
|
|
+ transientcraftingcontainer.resultInventory = new InventoryCraftResult(); // CraftBukkit - add result slot for event
|
|
return transientcraftingcontainer;
|
|
}
|
|
}
|