Upstream
/
EggCatcher
mirror of https://github.com/shansen/EggCatcher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from andrepl/master 

Preserve custom names on entities
This commit is contained in:
Shansen 2013-04-01 18:04:15 -07:00
parent cbadef3d7d 148dc516e3
commit 96497fc1d8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/me/shansen/EggCatcher/listeners/EggCatcherEntityListener.java
View File

@ -30,6 +30,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.plugin.java.JavaPlugin;
public class EggCatcherEntityListener implements Listener {
@ -244,7 +245,18 @@ public class EggCatcherEntityListener implements Listener {
if (this.smokeEffect) {
entity.getWorld().playEffect(entity.getLocation(), Effect.SMOKE, 0);
}
entity.getWorld().dropItem(entity.getLocation(), new ItemStack(383, 1, eggType.getCreatureId()));
ItemStack eggStack = new ItemStack(383, 1, eggType.getCreatureId());
String customName = ((LivingEntity) entity).getCustomName();
if (customName != null) {
// Entity had custom name
ItemMeta meta = eggStack.getItemMeta();
meta.setDisplayName(customName);
eggStack.setItemMeta(meta);
}
entity.getWorld().dropItem(entity.getLocation(), eggStack);
if (!this.spawnChickenOnSuccess) {
if (!EggCatcher.eggs.contains(egg)) {