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

Fixed NPE

Browse Source
This commit is contained in:
Taylor Kelly 2011-01-10 11:00:53 +08:00 committed by Dinner Bone
parent c6d80df80d
commit 750cc107ae
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minecraft/server/NetServerHandler.java
View File

@ -282,8 +282,12 @@ public class NetServerHandler extends NetHandler
// Craftbukkit start // Craftbukkit start
CraftBlock block = (CraftBlock) player.getWorld().getBlockAt(l, i1, j1); CraftBlock block = (CraftBlock) player.getWorld().getBlockAt(l, i1, j1);
int blockID = block.getTypeID(); int blockID = 0;
float damage = Block.m[blockID].a(player.getHandle()); //Get amount of damage going to block float damage = 0;
if(block != null) {
blockID = block.getTypeID();
damage = Block.m[blockID].a(player.getHandle()); //Get amount of damage going to block
}
if (packet14blockdig.e == 0) { if (packet14blockdig.e == 0) {
if (i2 > 16 || flag) { if (i2 > 16 || flag) {