Spigot / CraftBukkit / ce271f8abca

Commits

durron597 authored ce271f8abca 01 Jan 2011

Changed base of the source file to be based off of grum/mc-dev:

net/minecraft/server/BlockFlowing.java

src/main/java/net/minecraft/server/BlockFlowing.java

Modified

-1
+package net.minecraft.server;
-2
-+
-4
+import java.util.Random;
-5
-6
+import org.bukkit.BlockFace;
-7
+import org.bukkit.craftbukkit.CraftBlock;
-8
+import org.bukkit.event.Event.Type;
-9
+import org.bukkit.event.block.BlockFromToEvent;
-10
--
+public class BlockFlowing extends BlockFluids
--
+{
-+
+public class BlockFlowing extends BlockFluids {
-+
-+
+    int a;
-+
+    boolean b[];
-+
+    int c[];
-16
--
+    protected BlockFlowing(int i1, Material material)
--
+    {
-+
+    protected BlockFlowing(int i1, Material material) {
-18
+        super(i1, material);
-19
+        a = 0;
-20
+        b = new boolean[4];
-21
+        c = new int[4];
-22
+    }
-23
--
+    private void i(World world, int i1, int j1, int k1)
--
+    {
-+
+    private void i(World world, int i1, int j1, int k1) {
-25
+        int l1 = world.b(i1, j1, k1);
-+
-27
+        world.a(i1, j1, k1, bh + 1, l1);
-28
+        world.b(i1, j1, k1, i1, j1, k1);
-29
+        world.g(i1, j1, k1);
-30
+    }
-31
--
+    public void a(World world, int i1, int j1, int k1, Random random)
--
+    {
-+
+    public void a(World world, int i1, int j1, int k1, Random random) {
-33
+        int l1 = g(world, i1, j1, k1);
-34
+        byte byte0 = 1;
--
+        if(bs == Material.g && !world.q.d)
-+
-+
+        if (bs == Material.g && !world.q.d) {
-37
+            byte0 = 2;
-+
+        }
-39
+        boolean flag = true;
--
+        if(l1 > 0)
--
+        {
-+
-+
+        if (l1 > 0) {
-42
+            int i2 = -100;
-+
-44
+            a = 0;
-45
+            i2 = e(world, i1 - 1, j1, k1, i2);
-46
+            i2 = e(world, i1 + 1, j1, k1, i2);
-47
+            i2 = e(world, i1, j1, k1 - 1, i2);
-48
+            i2 = e(world, i1, j1, k1 + 1, i2);
-49
+            int j2 = i2 + byte0;
--
+            if(j2 >= 8 || i2 < 0)
-+
-+
+            if (j2 >= 8 || i2 < 0) {
-52
+                j2 = -1;
--
+            if(g(world, i1, j1 + 1, k1) >= 0)
--
+            {
-+
+            }
-+
+            if (g(world, i1, j1 + 1, k1) >= 0) {
-55
+                int l2 = g(world, i1, j1 + 1, k1);
--
+                if(l2 >= 8)
-+
-+
+                if (l2 >= 8) {
-58
+                    j2 = l2;
--
+                else
-+
+                } else {
-60
+                    j2 = l2 + 8;
-+
+                }
-62
+            }
--
+            if(a >= 2 && bs == Material.f)
--
+                if(world.d(i1, j1 - 1, k1))
-+
+            if (a >= 2 && bs == Material.f) {
-+
+                if (world.d(i1, j1 - 1, k1)) {
-+
+                    j2 = 0;
-+
+                } else if (world.c(i1, j1 - 1, k1) == bs && world.b(i1, j1, k1) == 0) {
-67
+                    j2 = 0;
--
+                else
--
+                    if(world.c(i1, j1 - 1, k1) == bs && world.b(i1, j1, k1) == 0)
--
+                        j2 = 0;
--
+            if(bs == Material.g && l1 < 8 && j2 < 8 && j2 > l1 && random.nextInt(4) != 0)
--
+            {
-+
+                }
-+
+            }
-+
+            if (bs == Material.g && l1 < 8 && j2 < 8 && j2 > l1 && random.nextInt(4) != 0) {
-71
+                j2 = l1;
-72
+                flag = false;
-73
+            }
--
+            if(j2 != l1)
--
+            {
-+
+            if (j2 != l1) {
-75
+                l1 = j2;
--
+                if(l1 < 0)
--
+                {
-+
+                if (l1 < 0) {
-77
+                    world.d(i1, j1, k1, 0);
--
+                } else
--
+                {
-+
+                } else {
-79
+                    world.b(i1, j1, k1, l1);
-80
+                    world.h(i1, j1, k1, bh);
-81
+                    world.g(i1, j1, k1, bh);
-82
+                }
--
+            } else
--
+                if(flag)
--
+                    i(world, i1, j1, k1);
--
+        } else
--
+        {
-+
+            } else if (flag) {
-+
+                i(world, i1, j1, k1);
-+
+            }
-+
+        } else {
-87
+            i(world, i1, j1, k1);
-88
+        }
--
-+
-90
+        // Craftbukkit start
-91
+        CraftBlock source = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i1, j1, k1);
--
--
+        if(l(world, i1, j1 - 1, k1))
--
+        {
-+
+        if (l(world, i1, j1 - 1, k1)) {
-93
+            // Craftbucket send "down" to the server
-94
+            BlockFromToEvent blockFlow = new BlockFromToEvent(Type.BLOCK_FLOW, source, BlockFace.Down);
-95
+            ((WorldServer) world).getServer().getPluginManager().callEvent(blockFlow);
-96
-97
+            if (!blockFlow.isCancelled()) {
--
+                if(l1 >= 8)
-+
+                if (l1 >= 8) {
-99
+                    world.b(i1, j1 - 1, k1, bh, l1);
--
+                else
-+
+                } else {
-101
+                    world.b(i1, j1 - 1, k1, bh, l1 + 8);
-+
+                }
-103
+            }
--
+        } else
--
+            if(l1 >= 0 && (l1 == 0 || k(world, i1, j1 - 1, k1)))
--
+            {
--
+                boolean aflag[] = j(world, i1, j1, k1);
--
+                int k2 = l1 + byte0;
--
+                if(l1 >= 8)
--
+                    k2 = 1;
--
+                if(k2 >= 8)
--
+                    return;
--
--
+                // Craftbukkit start
--
+                BlockFace[] faces = new BlockFace[]{ BlockFace.North, BlockFace.South, BlockFace.East, BlockFace.West };
--
+                for (BlockFace currentFace : faces) {
--
+                    int index = 0;
--
+                    if (aflag[index]) {
--
+                        BlockFromToEvent event = new BlockFromToEvent(Type.BLOCK_FLOW, source, currentFace);
--
+                        ((WorldServer) world).getServer().getPluginManager().callEvent(event);
--
+                        if (!event.isCancelled())
--
+                            f(world, i1 + currentFace.getModX(), j1, k1 + currentFace.getModZ(), k2);
--
+                    }
--
+                    index++;
-+
+        } else if (l1 >= 0 && (l1 == 0 || k(world, i1, j1 - 1, k1))) {
-+
+            boolean aflag[] = j(world, i1, j1, k1);
-+
+            int k2 = l1 + byte0;
-+
-+
+            if (l1 >= 8) {
-+
+                k2 = 1;
-+
+            }
-+
+            if (k2 >= 8) {
-+
+                return;
-+
+            }
-+
+            // Craftbukkit all four cardinal directions. Do not change the order!
-+
+            BlockFace[] faces = new BlockFace[]{ BlockFace.North, BlockFace.South, BlockFace.East, BlockFace.West };
-+
+            for (BlockFace currentFace : faces) {
-+
+                int index = 0;
-+
+                if (aflag[index]) {
-+
+                    BlockFromToEvent event = new BlockFromToEvent(Type.BLOCK_FLOW, source, currentFace);
-+
+                    ((WorldServer) world).getServer().getPluginManager().callEvent(event);
-+
+                    if (!event.isCancelled())
-+
+                        f(world, i1 + currentFace.getModX(), j1, k1 + currentFace.getModZ(), k2);
-123
+                }
--
+                // Craftbukkit stop
-+
+                index++;
-125
+            }
-+
+        }
-+
+        // Craftbukkit stop
-128
+    }
-129
--
+    private void f(World world, int i1, int j1, int k1, int l1)
--
+    {
--
+        if(l(world, i1, j1, k1))
--
+        {
-+
+    private void f(World world, int i1, int j1, int k1, int l1) {
-+
+        if (l(world, i1, j1, k1)) {
-132
+            int i2 = world.a(i1, j1, k1);
--
+            if(i2 > 0)
--
+                if(bs == Material.g)
-+
-+
+            if (i2 > 0) {
-+
+                if (bs == Material.g) {
-136
+                    h(world, i1, j1, k1);
--
+                else
-+
+                } else {
-138
+                    Block.m[i2].a_(world, i1, j1, k1, world.b(i1, j1, k1));
-+
+                }
-+
+            }
-141
+            world.b(i1, j1, k1, bh, l1);
-142
+        }
-143
+    }
-144
--
+    private int a(World world, int i1, int j1, int k1, int l1, int i2)
--
+    {
-+
+    private int a(World world, int i1, int j1, int k1, int l1, int i2) {
-146
+        int j2 = 1000;
--
+        for(int k2 = 0; k2 < 4; k2++)
--
+        {
--
+            if(k2 == 0 && i2 == 1 || k2 == 1 && i2 == 0 || k2 == 2 && i2 == 3 || k2 == 3 && i2 == 2)
-+
-+
+        for (int k2 = 0; k2 < 4; k2++) {
-+
+            if (k2 == 0 && i2 == 1 || k2 == 1 && i2 == 0 || k2 == 2 && i2 == 3 || k2 == 3 && i2 == 2) {
-150
+                continue;
-+
+            }
-152
+            int l2 = i1;
-153
+            int i3 = j1;
-154
+            int j3 = k1;
--
+            if(k2 == 0)
-+
-+
+            if (k2 == 0) {
-157
+                l2--;
--
+            if(k2 == 1)
-+
+            }
-+
+            if (k2 == 1) {
-160
+                l2++;
--
+            if(k2 == 2)
-+
+            }
-+
+            if (k2 == 2) {
-163
+                j3--;
--
+            if(k2 == 3)
-+
+            }
-+
+            if (k2 == 3) {
-166
+                j3++;
--
+            if(k(world, l2, i3, j3) || world.c(l2, i3, j3) == bs && world.b(l2, i3, j3) == 0)
-+
+            }
-+
+            if (k(world, l2, i3, j3) || world.c(l2, i3, j3) == bs && world.b(l2, i3, j3) == 0) {
-169
+                continue;
--
+            if(!k(world, l2, i3 - 1, j3))
-+
+            }
-+
+            if (!k(world, l2, i3 - 1, j3)) {
-172
+                return l1;
--
+            if(l1 >= 4)
-+
+            }
-+
+            if (l1 >= 4) {
-175
+                continue;
-+
+            }
-177
+            int k3 = a(world, l2, i3, j3, l1 + 1, k2);
--
+            if(k3 < j2)
-+
-+
+            if (k3 < j2) {
-180
+                j2 = k3;
-+
+            }
-182
+        }
-183
-184
+        return j2;
-185
+    }
-186
--
+    private boolean[] j(World world, int i1, int j1, int k1)
--
+    {
--
+        for(int l1 = 0; l1 < 4; l1++)
--
+        {
-+
+    private boolean[] j(World world, int i1, int j1, int k1) {
-+
+        for (int l1 = 0; l1 < 4; l1++) {
-189
+            c[l1] = 1000;
-190
+            int j2 = i1;
-191
+            int i3 = j1;
-192
+            int j3 = k1;
--
+            if(l1 == 0)
-+
-+
+            if (l1 == 0) {
-195
+                j2--;
--
+            if(l1 == 1)
-+
+            }
-+
+            if (l1 == 1) {
-198
+                j2++;
--
+            if(l1 == 2)
-+
+            }
-+
+            if (l1 == 2) {
-201
+                j3--;
--
+            if(l1 == 3)
-+
+            }
-+
+            if (l1 == 3) {
-204
+                j3++;
--
+            if(k(world, j2, i3, j3) || world.c(j2, i3, j3) == bs && world.b(j2, i3, j3) == 0)
-+
+            }
-+
+            if (k(world, j2, i3, j3) || world.c(j2, i3, j3) == bs && world.b(j2, i3, j3) == 0) {
-207
+                continue;
--
+            if(!k(world, j2, i3 - 1, j3))
-+
+            }
-+
+            if (!k(world, j2, i3 - 1, j3)) {
-210
+                c[l1] = 0;
--
+            else
-+
+            } else {
-212
+                c[l1] = a(world, j2, i3, j3, 1, l1);
-+
+            }
-214
+        }
-215
-216
+        int i2 = c[0];
--
+        for(int k2 = 1; k2 < 4; k2++)
--
+            if(c[k2] < i2)
-+
-+
+        for (int k2 = 1; k2 < 4; k2++) {
-+
+            if (c[k2] < i2) {
-220
+                i2 = c[k2];
-+
+            }
-+
+        }
-223
--
+        for(int l2 = 0; l2 < 4; l2++)
-+
+        for (int l2 = 0; l2 < 4; l2++) {
-225
+            b[l2] = c[l2] == i2;
-+
+        }
-227
-228
+        return b;
-229
+    }
-230
--
+    private boolean k(World world, int i1, int j1, int k1)
--
+    {
-+
+    private boolean k(World world, int i1, int j1, int k1) {
-232
+        int l1 = world.a(i1, j1, k1);
--
+        if(l1 == Block.aE.bh || l1 == Block.aL.bh || l1 == Block.aD.bh || l1 == Block.aF.bh || l1 == Block.aX.bh)
-+
-+
+        if (l1 == Block.aE.bh || l1 == Block.aL.bh || l1 == Block.aD.bh || l1 == Block.aF.bh || l1 == Block.aX.bh) {
-235
+            return true;
--
+        if(l1 == 0)
-+
+        }
-+
+        if (l1 == 0) {
-238
+            return false;
-+
+        }
-240
+        Material material = Block.m[l1].bs;
-+
-242
+        return material.a();
-243
+    }
-244
--
+    protected int e(World world, int i1, int j1, int k1, int l1)
--
+    {
-+
+    protected int e(World world, int i1, int j1, int k1, int l1) {
-246
+        int i2 = g(world, i1, j1, k1);
--
+        if(i2 < 0)
-+
-+
+        if (i2 < 0) {
-249
+            return l1;
--
+        if(i2 == 0)
-+
+        }
-+
+        if (i2 == 0) {
-252
+            a++;
--
+        if(i2 >= 8)
-+
+        }
-+
+        if (i2 >= 8) {
-255
+            i2 = 0;
-+
+        }
-257
+        return l1 >= 0 && i2 >= l1 ? l1 : i2;
-258
+    }
-259
--
+    private boolean l(World world, int i1, int j1, int k1)
--
+    {
-+
+    private boolean l(World world, int i1, int j1, int k1) {
-261
+        Material material = world.c(i1, j1, k1);
--
+        if(material == bs)
-+
-+
+        if (material == bs) {
-264
+            return false;
--
+        if(material == Material.g)
-+
+        }
-+
+        if (material == Material.g) {
-267
+            return false;
--
+        else
-+
+        } else {
-269
+            return !k(world, i1, j1, k1);
-+
+        }
-271
+    }
-272
--
+    public void e(World world, int i1, int j1, int k1)
--
+    {
-+
+    public void e(World world, int i1, int j1, int k1) {
-274
+        super.e(world, i1, j1, k1);
--
+        if(world.a(i1, j1, k1) == bh)
-+
+        if (world.a(i1, j1, k1) == bh) {
-276
+            world.h(i1, j1, k1, bh);
-+
+        }
-278
+    }
-+
+}
-280
--
+    int a;
--
+    boolean b[];
--
+    int c[];
--
+}

CraftBukkit

Commits

Jira Issues

Add shortcut