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

Fixed trapdoors + few comments

Browse Source
This commit is contained in:
Nathan Adams 2011-11-23 00:08:56 +00:00
parent 929e5ff6c7
commit 03762600df
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/BlockDoor.java
View File

@ -166,7 +166,7 @@ public class BlockDoor extends Block {
if (!world.isStatic) { if (!world.isStatic) {
this.b(world, i, j, k, i1, 0); this.b(world, i, j, k, i1, 0);
} }
} else if (l > 0 && Block.byId[l].isPowerSource()) { } else if (l > 0) {
// CraftBukkit start // CraftBukkit start
org.bukkit.World bworld = world.getWorld(); org.bukkit.World bworld = world.getWorld();
org.bukkit.block.Block block = bworld.getBlockAt(i, j, k); org.bukkit.block.Block block = bworld.getBlockAt(i, j, k);

6
src/main/java/net/minecraft/server/BlockTrapdoor.java
View File

@ -30,7 +30,7 @@ public class BlockTrapdoor extends Block {
} }
public AxisAlignedBB e(World world, int i, int j, int k) { public AxisAlignedBB e(World world, int i, int j, int k) {
this.a(world, i, j, k); this.a((IBlockAccess)world, i, j, k); // CraftBukkit - Make sure this points to the below method!
return super.e(world, i, j, k); return super.e(world, i, j, k);
} }
@ -121,14 +121,14 @@ public class BlockTrapdoor extends Block {
} }
// CraftBukkit start // CraftBukkit start
if (l > 0 && Block.byId[l] != null && Block.byId[l].isPowerSource()) { if (l > 0) {
org.bukkit.World bworld = world.getWorld(); org.bukkit.World bworld = world.getWorld();
org.bukkit.block.Block block = bworld.getBlockAt(i, j, k); org.bukkit.block.Block block = bworld.getBlockAt(i, j, k);
int power = block.getBlockPower(); int power = block.getBlockPower();
int oldPower = (world.getData(i, j, k) & 4) > 0 ? 15 : 0; int oldPower = (world.getData(i, j, k) & 4) > 0 ? 15 : 0;
if (oldPower == 0 ^ power == 0) { if (oldPower == 0 ^ power == 0 || (Block.byId[l] != null && Block.byId[l].isPowerSource())) {
BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, oldPower, power); BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, oldPower, power);
world.getServer().getPluginManager().callEvent(eventRedstone); world.getServer().getPluginManager().callEvent(eventRedstone);

4
src/main/java/net/minecraft/server/EntityLiving.java
View File

@ -134,8 +134,8 @@ public abstract class EntityLiving extends Entity {
this.ae(); this.ae();
} }
// CraftBukkit start - don't inline the damage, perform it with an event
if (this.aj() && this.T()) { if (this.aj() && this.T()) {
// CraftBukkit start
EntityDamageEvent event = new EntityDamageEvent(this.getBukkitEntity(), EntityDamageEvent.DamageCause.SUFFOCATION, 1); EntityDamageEvent event = new EntityDamageEvent(this.getBukkitEntity(), EntityDamageEvent.DamageCause.SUFFOCATION, 1);
this.world.getServer().getPluginManager().callEvent(event); this.world.getServer().getPluginManager().callEvent(event);
@ -225,7 +225,7 @@ public abstract class EntityLiving extends Entity {
if (this.deathTicks == 20) { if (this.deathTicks == 20) {
int i; int i;
// CraftBukkit start - update getExpReward() below if the removed if() changes! // CraftBukkit start - update getExpReward() above if the removed if() changes!
i = expToDrop; i = expToDrop;
while (i > 0) { while (i > 0) {
int j = EntityExperienceOrb.b(i); int j = EntityExperienceOrb.b(i);