Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 05:25:42 +01:00
Code Issues Projects Releases Wiki Activity

BlockFlowing NPE fix.

Browse Source
This commit is contained in:
Erik Broes 2011-03-02 21:24:19 +01:00
parent 34458efd83
commit 332b0c2ca9
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/minecraft/server/BlockFlowing.java
View File

@ -2,12 +2,12 @@ package net.minecraft.server;
import java.util.Random; import java.util.Random;
// CraftBukkit start
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.event.Event.Type; import org.bukkit.event.Event.Type;
import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.BlockFromToEvent;
// CraftBukkit end
public class BlockFlowing extends BlockFluids { public class BlockFlowing extends BlockFluids {
@ -28,8 +28,11 @@ public class BlockFlowing extends BlockFluids {
} }
public void a(World world, int i, int j, int k, Random random) { public void a(World world, int i, int j, int k, Random random) {
// CraftBukkit // CraftBukkit start
CraftBlock source = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k); CraftWorld cworld = ((WorldServer) world).getWorld();
CraftServer server = ((WorldServer) world).getServer();
CraftBlock source = cworld == null ? null : (CraftBlock) cworld.getBlockAt(i, j, k);
// CraftBukkit end
int l = this.g(world, i, j, k); int l = this.g(world, i, j, k);
byte b0 = 1; byte b0 = 1;
@ -97,7 +100,9 @@ public class BlockFlowing extends BlockFluids {
if (this.l(world, i, j - 1, k)) { if (this.l(world, i, j - 1, k)) {
// CraftBukkit start - send "down" to the server // CraftBukkit start - send "down" to the server
BlockFromToEvent event = new BlockFromToEvent(Type.BLOCK_FLOW, source, BlockFace.DOWN); BlockFromToEvent event = new BlockFromToEvent(Type.BLOCK_FLOW, source, BlockFace.DOWN);
((WorldServer) world).getServer().getPluginManager().callEvent(event); if (server != null) {
server.getPluginManager().callEvent(event);
}
if (!event.isCancelled()) { if (!event.isCancelled()) {
if (l >= 8) { if (l >= 8) {
@ -125,7 +130,11 @@ public class BlockFlowing extends BlockFluids {
for (BlockFace currentFace: faces) { for (BlockFace currentFace: faces) {
if (aboolean[index]) { if (aboolean[index]) {
BlockFromToEvent event = new BlockFromToEvent(Type.BLOCK_FLOW, source, currentFace); BlockFromToEvent event = new BlockFromToEvent(Type.BLOCK_FLOW, source, currentFace);
((WorldServer) world).getServer().getPluginManager().callEvent(event);
if (server != null) {
server.getPluginManager().callEvent(event);
}
if (!event.isCancelled()) { if (!event.isCancelled()) {
this.g(world, i + currentFace.getModX(), j, k + currentFace.getModZ(), i1); this.g(world, i + currentFace.getModX(), j, k + currentFace.getModZ(), i1);
} }