mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-21 03:11:07 +02:00
88 lines
4.0 KiB
Diff
88 lines
4.0 KiB
Diff
--- a/net/minecraft/server/EntitySheep.java
|
|
+++ b/net/minecraft/server/EntitySheep.java
|
|
@@ -9,10 +9,16 @@
|
|
import java.util.stream.Collectors;
|
|
import javax.annotation.Nullable;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.event.entity.SheepRegrowWoolEvent;
|
|
+import org.bukkit.event.player.PlayerShearEntityEvent;
|
|
+import org.bukkit.inventory.InventoryView;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntitySheep extends EntityAnimal {
|
|
|
|
private static final DataWatcherObject<Byte> bw = DataWatcher.a(EntitySheep.class, DataWatcherRegistry.a);
|
|
- private static final Map<EnumColor, IMaterial> bx = (Map) SystemUtils.a((Object) Maps.newEnumMap(EnumColor.class), (enummap) -> {
|
|
+ private static final Map<EnumColor, IMaterial> bx = (Map) SystemUtils.a(Maps.newEnumMap(EnumColor.class), (enummap) -> { // CraftBukkit - decompile error
|
|
enummap.put(EnumColor.WHITE, Blocks.WHITE_WOOL);
|
|
enummap.put(EnumColor.ORANGE, Blocks.ORANGE_WOOL);
|
|
enummap.put(EnumColor.MAGENTA, Blocks.MAGENTA_WOOL);
|
|
@@ -141,6 +147,15 @@
|
|
ItemStack itemstack = entityhuman.b(enumhand);
|
|
|
|
if (itemstack.getItem() == Items.SHEARS && !this.isSheared() && !this.isBaby()) {
|
|
+ // CraftBukkit start
|
|
+ PlayerShearEntityEvent event = new PlayerShearEntityEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), this.getBukkitEntity());
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
this.shear();
|
|
if (!this.world.isClientSide) {
|
|
itemstack.damage(1, entityhuman, (entityhuman1) -> {
|
|
@@ -160,7 +175,9 @@
|
|
int i = 1 + this.random.nextInt(3);
|
|
|
|
for (int j = 0; j < i; ++j) {
|
|
+ this.forceDrops = true; // CraftBukkit
|
|
EntityItem entityitem = this.a((IMaterial) EntitySheep.bx.get(this.getColor()), 1);
|
|
+ this.forceDrops = false; // CraftBukkit
|
|
|
|
if (entityitem != null) {
|
|
entityitem.setMot(entityitem.getMot().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)));
|
|
@@ -247,6 +264,12 @@
|
|
|
|
@Override
|
|
public void blockEaten() {
|
|
+ // CraftBukkit start
|
|
+ SheepRegrowWoolEvent event = new SheepRegrowWoolEvent((org.bukkit.entity.Sheep) this.getBukkitEntity());
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled()) return;
|
|
+ // CraftBukkit end
|
|
this.setSheared(false);
|
|
if (this.isBaby()) {
|
|
this.setAge(60);
|
|
@@ -265,7 +288,7 @@
|
|
EnumColor enumcolor = ((EntitySheep) entityanimal).getColor();
|
|
EnumColor enumcolor1 = ((EntitySheep) entityanimal1).getColor();
|
|
InventoryCrafting inventorycrafting = a(enumcolor, enumcolor1);
|
|
- Optional optional = this.world.getCraftingManager().craft(Recipes.CRAFTING, inventorycrafting, this.world).map((recipecrafting) -> {
|
|
+ Optional<Item> optional = this.world.getCraftingManager().craft(Recipes.CRAFTING, inventorycrafting, this.world).map((recipecrafting) -> { // Eclipse fail
|
|
return recipecrafting.a(inventorycrafting);
|
|
}).map(ItemStack::getItem);
|
|
|
|
@@ -283,10 +306,18 @@
|
|
public boolean canUse(EntityHuman entityhuman) {
|
|
return false;
|
|
}
|
|
+
|
|
+ // CraftBukkit start
|
|
+ @Override
|
|
+ public InventoryView getBukkitView() {
|
|
+ return null; // TODO: O.O
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}, 2, 1);
|
|
|
|
inventorycrafting.setItem(0, new ItemStack(ItemDye.a(enumcolor)));
|
|
inventorycrafting.setItem(1, new ItemStack(ItemDye.a(enumcolor1)));
|
|
+ inventorycrafting.resultInventory = new InventoryCraftResult(); // CraftBukkit - add result slot for event
|
|
return inventorycrafting;
|
|
}
|
|
|