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

#1428: Expose Creeper igniter

Browse Source
This commit is contained in:
Doc 2024-06-19 06:48:33 +10:00 committed by md_5
parent d01c70e93e
commit d0e6af2d41
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nms-patches/net/minecraft/world/entity/monster/EntityCreeper.patch
View File

@ -18,7 +18,7 @@
public int maxSwell = 30; public int maxSwell = 30;
public int explosionRadius = 3; public int explosionRadius = 3;
private int droppedSkulls; private int droppedSkulls;
+ private EntityHuman entityIgniter; // CraftBukkit + public Entity entityIgniter; // CraftBukkit
public EntityCreeper(EntityTypes<? extends EntityCreeper> entitytypes, World world) { public EntityCreeper(EntityTypes<? extends EntityCreeper> entitytypes, World world) {
super(entitytypes, world); super(entitytypes, world);

13
src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
View File

@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.monster.EntityCreeper; import net.minecraft.world.entity.monster.EntityCreeper;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Creeper; import org.bukkit.entity.Creeper;
import org.bukkit.entity.Entity;
import org.bukkit.event.entity.CreeperPowerEvent; import org.bukkit.event.entity.CreeperPowerEvent;
public class CraftCreeper extends CraftMonster implements Creeper { public class CraftCreeper extends CraftMonster implements Creeper {
@ -75,11 +76,23 @@ public class CraftCreeper extends CraftMonster implements Creeper {
getHandle().explodeCreeper(); getHandle().explodeCreeper();
} }
@Override
public void ignite(Entity entity) {
Preconditions.checkNotNull(entity, "entity cannot be null");
getHandle().entityIgniter = ((CraftEntity) entity).getHandle();
getHandle().ignite();
}
@Override @Override
public void ignite() { public void ignite() {
getHandle().ignite(); getHandle().ignite();
} }
@Override
public Entity getIgniter() {
return (getHandle().entityIgniter != null) ? getHandle().entityIgniter.getBukkitEntity() : null;
}
@Override @Override
public EntityCreeper getHandle() { public EntityCreeper getHandle() {
return (EntityCreeper) entity; return (EntityCreeper) entity;