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

Moved block stuff from org.bukkit to org.bukkit.block

Browse Source
This commit is contained in:
Dinnerbone 2011-01-15 21:36:57 +00:00
parent 7877229881
commit 0db8d5d111
16 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ package net.minecraft.server;
import java.util.Random; import java.util.Random;
// CraftBukkit start // CraftBukkit start
import org.bukkit.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.event.Event.Type; import org.bukkit.event.Event.Type;

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

@ -86,8 +86,8 @@ public class BlockFire extends Block {
// CraftBukkit: Call to stop spead of fire. // CraftBukkit: Call to stop spead of fire.
CraftServer server = ((WorldServer)world).getServer(); CraftServer server = ((WorldServer)world).getServer();
CraftWorld cworld = ((WorldServer) world).getWorld(); CraftWorld cworld = ((WorldServer) world).getWorld();
org.bukkit.Block bblock = (cworld.getBlockAt(i1, k1, j1)); org.bukkit.block.Block bblock = (cworld.getBlockAt(i1, k1, j1));
BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.Block) bblock, BlockIgniteEvent.IgniteCause.SPREAD, null); BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.block.Block) bblock, BlockIgniteEvent.IgniteCause.SPREAD, null);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
@ -111,8 +111,8 @@ public class BlockFire extends Block {
// CraftBukkit: Call to stop very slow spread of fire. // CraftBukkit: Call to stop very slow spread of fire.
CraftServer server = ((WorldServer)world).getServer(); CraftServer server = ((WorldServer)world).getServer();
CraftWorld cworld = ((WorldServer)world).getWorld(); CraftWorld cworld = ((WorldServer)world).getWorld();
org.bukkit.Block sbblock = (cworld.getBlockAt(i, j, k)); org.bukkit.block.Block sbblock = (cworld.getBlockAt(i, j, k));
BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.Block) sbblock, BlockIgniteEvent.IgniteCause.SLOW_SPREAD, null); BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.block.Block) sbblock, BlockIgniteEvent.IgniteCause.SLOW_SPREAD, null);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;

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

@ -3,7 +3,7 @@ package net.minecraft.server;
import java.util.Random; import java.util.Random;
// CraftBukkit start // CraftBukkit start
import org.bukkit.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.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;

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

@ -1,7 +1,7 @@
package net.minecraft.server; package net.minecraft.server;
// CraftBukkit start // CraftBukkit start
import org.bukkit.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.event.Event.Type; import org.bukkit.event.Event.Type;

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

@ -4,7 +4,7 @@ import java.util.List;
import java.util.Random; import java.util.Random;
// CraftBukkit start // CraftBukkit start
import org.bukkit.BlockFace;import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.block.BlockFace;import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.craftbukkit.entity.CraftLivingEntity; import org.bukkit.craftbukkit.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.event.Event.Type; import org.bukkit.event.Event.Type;

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

@ -1,7 +1,7 @@
package net.minecraft.server; package net.minecraft.server;
import java.util.*; import java.util.*;
import org.bukkit.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.event.block.BlockRedstoneEvent; import org.bukkit.event.block.BlockRedstoneEvent;

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

@ -5,7 +5,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
import org.bukkit.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.event.block.BlockRedstoneEvent; import org.bukkit.event.block.BlockRedstoneEvent;
import org.bukkit.plugin.PluginLoader; import org.bukkit.plugin.PluginLoader;

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

@ -39,8 +39,8 @@ public class BlockStationary extends BlockFluids {
// Craftbukkit start: prevent lava putting something on fire. // Craftbukkit start: prevent lava putting something on fire.
CraftServer server = ((WorldServer)world).getServer(); CraftServer server = ((WorldServer)world).getServer();
CraftWorld cworld = ((WorldServer)world).getWorld(); CraftWorld cworld = ((WorldServer)world).getWorld();
org.bukkit.Block bblock = (cworld.getBlockAt(k, l, i1)); org.bukkit.block.Block bblock = (cworld.getBlockAt(k, l, i1));
BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.Block) bblock, BlockIgniteEvent.IgniteCause.LAVA, null); BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.block.Block) bblock, BlockIgniteEvent.IgniteCause.LAVA, null);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;

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

@ -1,7 +1,7 @@
package net.minecraft.server; package net.minecraft.server;
// CraftBukkit start // CraftBukkit start
import org.bukkit.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.entity.CraftPlayer;

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

@ -3,7 +3,7 @@ package net.minecraft.server;
import java.util.Random; import java.util.Random;
// CraftBukkit start // CraftBukkit start
import org.bukkit.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.entity.CraftPlayer;

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

@ -50,8 +50,8 @@ public class ItemFlintAndSteel extends Item {
PlayerItemEvent pie = new PlayerItemEvent(Type.PLAYER_ITEM, thePlayer, itemInHand, blockClicked, CraftBlock.notchToBlockFace(l)); PlayerItemEvent pie = new PlayerItemEvent(Type.PLAYER_ITEM, thePlayer, itemInHand, blockClicked, CraftBlock.notchToBlockFace(l));
((WorldServer) world).getServer().getPluginManager().callEvent(pie); ((WorldServer) world).getServer().getPluginManager().callEvent(pie);
org.bukkit.Block pblock = (((WorldServer) world).getWorld().getBlockAt(i, j, k)); org.bukkit.block.Block pblock = (((WorldServer) world).getWorld().getBlockAt(i, j, k));
BlockIgniteEvent bie = new BlockIgniteEvent((org.bukkit.Block) pblock, BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, thePlayer); BlockIgniteEvent bie = new BlockIgniteEvent((org.bukkit.block.Block) pblock, BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, thePlayer);
((WorldServer) world).getServer().getPluginManager().callEvent(bie); ((WorldServer) world).getServer().getPluginManager().callEvent(bie);
boolean preventLighter = pie.isCancelled(); boolean preventLighter = pie.isCancelled();

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

@ -5,8 +5,8 @@ import java.util.*;
import java.util.logging.Logger; import java.util.logging.Logger;
// CraftBukkit start // CraftBukkit start
import org.bukkit.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.BlockDamageLevel; import org.bukkit.block.BlockDamageLevel;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.inventory.CraftItemStack;

3
src/main/java/org/bukkit/craftbukkit/CraftBlock.java
View File

@ -1,6 +1,9 @@
package org.bukkit.craftbukkit; package org.bukkit.craftbukkit;
import org.bukkit.block.BlockFace;
import org.bukkit.block.Biome;
import org.bukkit.block.Block;
import net.minecraft.server.MobSpawnerBase; import net.minecraft.server.MobSpawnerBase;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;

2
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -31,7 +31,7 @@ import net.minecraft.server.WorldGenBigTree;
import net.minecraft.server.WorldServer; import net.minecraft.server.WorldServer;
import net.minecraft.server.WorldGenTrees; import net.minecraft.server.WorldGenTrees;
import org.bukkit.entity.Arrow; import org.bukkit.entity.Arrow;
import org.bukkit.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Boat; import org.bukkit.entity.Boat;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.entity.ItemDrop; import org.bukkit.entity.ItemDrop;

2
src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
View File

@ -1,7 +1,7 @@
package org.bukkit.craftbukkit.block; package org.bukkit.craftbukkit.block;
import org.bukkit.Block; import org.bukkit.block.Block;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;

2
src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
View File

@ -2,7 +2,7 @@
package org.bukkit.craftbukkit.block; package org.bukkit.craftbukkit.block;
import net.minecraft.server.TileEntitySign; import net.minecraft.server.TileEntitySign;
import org.bukkit.Block; import org.bukkit.block.Block;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;
import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.CraftWorld;