Add event for fire arrows igniting TNT - pulls Bukkit/CraftBukkit#1203
This commit is contained in:
BlackHole
md_5
parent
3ab9109cdb
commit
6d4063f6ef
2 changed files with 113 additions and 1 deletions
|
|
@ -1,9 +1,95 @@
|
||||||
From 9520c287eca34c28ed9a7a53e65755b89b22e7af Mon Sep 17 00:00:00 2001
|
From e15463f906861778a9a2c9a62155c6f226330b10 Mon Sep 17 00:00:00 2001
|
||||||
From: md_5 <md_5@live.com.au>
|
From: md_5 <md_5@live.com.au>
|
||||||
Date: Tue, 2 Jul 2013 13:13:29 +1000
|
Date: Tue, 2 Jul 2013 13:13:29 +1000
|
||||||
Subject: [PATCH] mc-dev imports
|
Subject: [PATCH] mc-dev imports
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..d336901
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/main/java/net/minecraft/server/BlockTNT.java
|
||||||
|
@@ -0,0 +1,80 @@
|
||||||
|
+package net.minecraft.server;
|
||||||
|
+
|
||||||
|
+import java.util.Random;
|
||||||
|
+
|
||||||
|
+public class BlockTNT extends Block {
|
||||||
|
+
|
||||||
|
+ public BlockTNT(int i) {
|
||||||
|
+ super(i, Material.TNT);
|
||||||
|
+ this.a(CreativeModeTab.d);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void onPlace(World world, int i, int j, int k) {
|
||||||
|
+ super.onPlace(world, i, j, k);
|
||||||
|
+ if (world.isBlockIndirectlyPowered(i, j, k)) {
|
||||||
|
+ this.postBreak(world, i, j, k, 1);
|
||||||
|
+ world.setAir(i, j, k);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void doPhysics(World world, int i, int j, int k, int l) {
|
||||||
|
+ if (world.isBlockIndirectlyPowered(i, j, k)) {
|
||||||
|
+ this.postBreak(world, i, j, k, 1);
|
||||||
|
+ world.setAir(i, j, k);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public int a(Random random) {
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void wasExploded(World world, int i, int j, int k, Explosion explosion) {
|
||||||
|
+ if (!world.isStatic) {
|
||||||
|
+ EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), explosion.c());
|
||||||
|
+
|
||||||
|
+ entitytntprimed.fuseTicks = world.random.nextInt(entitytntprimed.fuseTicks / 4) + entitytntprimed.fuseTicks / 8;
|
||||||
|
+ world.addEntity(entitytntprimed);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void postBreak(World world, int i, int j, int k, int l) {
|
||||||
|
+ this.a(world, i, j, k, l, (EntityLiving) null);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void a(World world, int i, int j, int k, int l, EntityLiving entityliving) {
|
||||||
|
+ if (!world.isStatic) {
|
||||||
|
+ if ((l & 1) == 1) {
|
||||||
|
+ EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), entityliving);
|
||||||
|
+
|
||||||
|
+ world.addEntity(entitytntprimed);
|
||||||
|
+ world.makeSound(entitytntprimed, "random.fuse", 1.0F, 1.0F);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman, int l, float f, float f1, float f2) {
|
||||||
|
+ if (entityhuman.bx() != null && entityhuman.bx().id == Item.FLINT_AND_STEEL.id) {
|
||||||
|
+ this.a(world, i, j, k, 1, entityhuman);
|
||||||
|
+ world.setAir(i, j, k);
|
||||||
|
+ entityhuman.bx().damage(1, entityhuman);
|
||||||
|
+ return true;
|
||||||
|
+ } else {
|
||||||
|
+ return super.interact(world, i, j, k, entityhuman, l, f, f1, f2);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void a(World world, int i, int j, int k, Entity entity) {
|
||||||
|
+ if (entity instanceof EntityArrow && !world.isStatic) {
|
||||||
|
+ EntityArrow entityarrow = (EntityArrow) entity;
|
||||||
|
+
|
||||||
|
+ if (entityarrow.isBurning()) {
|
||||||
|
+ this.a(world, i, j, k, 1, entityarrow.shooter instanceof EntityLiving ? (EntityLiving) entityarrow.shooter : null);
|
||||||
|
+ world.setAir(i, j, k);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public boolean a(Explosion explosion) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
|
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..aa937fb
|
index 0000000..aa937fb
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
From a8c84748c5cacdf747f752eeaa46a42f1b636dc9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: BlackHole <black-hole@live.com>
|
||||||
|
Date: Tue, 16 Jul 2013 22:34:50 +0200
|
||||||
|
Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT
|
||||||
|
|
||||||
|
Adds BUKKIT-4355
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
|
||||||
|
index d336901..9ca1050 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/BlockTNT.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/BlockTNT.java
|
||||||
|
@@ -68,6 +68,11 @@ public class BlockTNT extends Block {
|
||||||
|
EntityArrow entityarrow = (EntityArrow) entity;
|
||||||
|
|
||||||
|
if (entityarrow.isBurning()) {
|
||||||
|
+ // CraftBukkit start
|
||||||
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityarrow, i, j, k, 0, 0).isCancelled()) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ // CraftBukkit end
|
||||||
|
this.a(world, i, j, k, 1, entityarrow.shooter instanceof EntityLiving ? (EntityLiving) entityarrow.shooter : null);
|
||||||
|
world.setAir(i, j, k);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
1.8.1.2
|
||||||
|
|
||||||
Loading…
Reference in a new issue