Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 22:44:17 +01:00
Code Issues Projects Releases Wiki Activity

[Bleeding] Implemented Sheep, Shear and EntityChangeBlock API. Thanks

Browse Source 
tips48! Closes BUKKIT-512
This commit is contained in:
Aidan Matzko 2012-01-21 21:28:32 -05:00 committed by EvilSeph
parent 229337bc8f
commit 93bc8ecd93
2 changed files with 63 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/net/minecraft/server/EntitySheep.java
View File

@ -1,7 +1,12 @@
package net.minecraft.server; package net.minecraft.server;
import java.util.Random; import java.util.Random;
// CraftBukkit start
import org.bukkit.Material;
import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.entity.EntityChangeBlockEvent;
// CraftBukkit end
public class EntitySheep extends EntityAnimal { public class EntitySheep extends EntityAnimal {
@ -73,17 +78,47 @@ public class EntitySheep extends EntityAnimal {
boolean flag = false; boolean flag = false;
if (this.world.getTypeId(i, j, k) == Block.LONG_GRASS.id) { if (this.world.getTypeId(i, j, k) == Block.LONG_GRASS.id) {
// CraftBukkit start
org.bukkit.World bworld = this.world.getWorld();
org.bukkit.block.Block bblock = bworld.getBlockAt(i, j, k);
EntityChangeBlockEvent event = new EntityChangeBlockEvent(this.getBukkitEntity(), bblock, Material.AIR);
this.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
this.world.f(2001, i, j, k, Block.LONG_GRASS.id + 256); this.world.f(2001, i, j, k, Block.LONG_GRASS.id + 256);
this.world.setTypeId(i, j, k, 0); this.world.setTypeId(i, j, k, 0);
flag = true; flag = true;
}
// CraftBukkit end
} else if (this.world.getTypeId(i, j - 1, k) == Block.GRASS.id) { } else if (this.world.getTypeId(i, j - 1, k) == Block.GRASS.id) {
// CraftBukkit start
org.bukkit.World bworld = this.world.getWorld();
org.bukkit.block.Block bblock = bworld.getBlockAt(i, j - 1, k);
EntityChangeBlockEvent event = new EntityChangeBlockEvent(this.getBukkitEntity(), bblock, Material.DIRT);
this.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
this.world.f(2001, i, j - 1, k, Block.GRASS.id); this.world.f(2001, i, j - 1, k, Block.GRASS.id);
this.world.setTypeId(i, j - 1, k, Block.DIRT.id); this.world.setTypeId(i, j - 1, k, Block.DIRT.id);
flag = true; flag = true;
} }
// CraftBukkit end
}
if (flag) { if (flag) {
// CraftBukkit start
if (!this.isBaby()) {
org.bukkit.event.entity.SheepRegrowWoolEvent event = new org.bukkit.event.entity.SheepRegrowWoolEvent(this.getBukkitEntity());
this.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
this.setSheared(false); this.setSheared(false);
}
}
// CraftBukkit end
if (this.isBaby()) { if (this.isBaby()) {
int l = this.getAge() + 1200; int l = this.getAge() + 1200;
@ -106,6 +141,15 @@ public class EntitySheep extends EntityAnimal {
if (itemstack != null && itemstack.id == Item.SHEARS.id && !this.isSheared() && !this.isBaby()) { if (itemstack != null && itemstack.id == Item.SHEARS.id && !this.isSheared() && !this.isBaby()) {
if (!this.world.isStatic) { if (!this.world.isStatic) {
// CraftBukkit start
org.bukkit.event.player.PlayerShearEntityEvent event = new org.bukkit.event.player.PlayerShearEntityEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), this.getBukkitEntity());
this.world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return false;
}
// CraftBukkit end
this.setSheared(true); this.setSheared(true);
int i = 1 + this.random.nextInt(3); int i = 1 + this.random.nextInt(3);

13
src/main/java/net/minecraft/server/ItemDye.java
View File

@ -113,7 +113,18 @@ public class ItemDye extends Item {
int i = BlockCloth.d(itemstack.getData()); int i = BlockCloth.d(itemstack.getData());
if (!entitysheep.isSheared() && entitysheep.getColor() != i) { if (!entitysheep.isSheared() && entitysheep.getColor() != i) {
entitysheep.setColor(i); // CraftBukkit start
byte bColor = new Integer(i).byteValue();
org.bukkit.event.entity.SheepDyeWoolEvent event = new org.bukkit.event.entity.SheepDyeWoolEvent(entitysheep.getBukkitEntity(), org.bukkit.DyeColor.getByData(bColor));
entitysheep.world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return;
}
int iColor = new Byte(event.getColor().getData()).intValue();
entitysheep.setColor(iColor);
// CraftBukkit end
--itemstack.count; --itemstack.count;
} }
} }