summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index c9a3a2a1..eb8958b8 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -282,10 +282,9 @@ public class NetServerHandler extends NetHandler
// Craftbukkit start
CraftBlock block = (CraftBlock) player.getWorld().getBlockAt(l, i1, j1);
- int blockID = 0;
+ int blockID = block.getTypeID();
float damage = 0;
- if(block != null) {
- blockID = block.getTypeID();
+ if(Block.m[blockID] != null) {
damage = Block.m[blockID].a(player.getHandle()); //Get amount of damage going to block
}