SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität

Events should be present tense, not paste tense.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Erik Broes 2011-01-15 21:26:05 +01:00
Ursprung 2184d240db
Commit 8c8f53fd44
7 geänderte Dateien mit 24 neuen und 24 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
src/main/java/net/minecraft/server/BlockCactus.java
Datei anzeigen

@ -6,8 +6,8 @@ import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.craftbukkit.CraftEntity; import org.bukkit.craftbukkit.CraftEntity;
import org.bukkit.craftbukkit.CraftLivingEntity; import org.bukkit.craftbukkit.CraftLivingEntity;
import org.bukkit.craftbukkit.CraftPlayer; import org.bukkit.craftbukkit.CraftPlayer;
import org.bukkit.event.entity.EntityDamagedByBlockEvent; import org.bukkit.event.entity.EntityDamageByBlockEvent;
import org.bukkit.event.entity.EntityDamagedEvent; import org.bukkit.event.entity.EntityDamageEvent;
// CraftBukkit end // CraftBukkit end
import java.util.Random; import java.util.Random;
@ -104,7 +104,7 @@ public class BlockCactus extends Block {
} }
if(toPassIn != null) { if(toPassIn != null) {
EntityDamagedByBlockEvent edbbe = new EntityDamagedByBlockEvent(((WorldServer) world).getWorld().getBlockAt(i, j, k), toPassIn, EntityDamagedEvent.DamageCause.CONTACT, 1); EntityDamageByBlockEvent edbbe = new EntityDamageByBlockEvent(((WorldServer) world).getWorld().getBlockAt(i, j, k), toPassIn, EntityDamageEvent.DamageCause.CONTACT, 1);
((WorldServer) world).getServer().getPluginManager().callEvent(edbbe); ((WorldServer) world).getServer().getPluginManager().callEvent(edbbe);
if (edbbe.isCancelled()) if (edbbe.isCancelled())

4
src/main/java/net/minecraft/server/ChunkProviderServer.java
Datei anzeigen

@ -8,7 +8,7 @@ import org.bukkit.craftbukkit.CraftChunk;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.event.Event.Type; import org.bukkit.event.Event.Type;
import org.bukkit.event.world.ChunkLoadedEvent; import org.bukkit.event.world.ChunkLoadEvent;
// CraftBukkit end // CraftBukkit end
public class ChunkProviderServer implements IChunkProvider { public class ChunkProviderServer implements IChunkProvider {
@ -79,7 +79,7 @@ public class ChunkProviderServer implements IChunkProvider {
*/ */
CraftWorld world = g.getWorld(); CraftWorld world = g.getWorld();
CraftChunk cchunk = world.updateChunk(i, j); CraftChunk cchunk = world.updateChunk(i, j);
server.getPluginManager().callEvent(new ChunkLoadedEvent(Type.CHUNK_LOADED, cchunk)); server.getPluginManager().callEvent(new ChunkLoadEvent(Type.CHUNK_LOADED, cchunk));
} }
// CraftBukkit end // CraftBukkit end

4
src/main/java/net/minecraft/server/Entity.java
Datei anzeigen

@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftEntity;
import org.bukkit.craftbukkit.CraftLivingEntity; import org.bukkit.craftbukkit.CraftLivingEntity;
import org.bukkit.craftbukkit.CraftPlayer; import org.bukkit.craftbukkit.CraftPlayer;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamagedEvent; import org.bukkit.event.entity.EntityDamageEvent;
// CraftBukkit end // CraftBukkit end
import java.util.List; import java.util.List;
@ -476,7 +476,7 @@ public abstract class Entity {
defender = new CraftLivingEntity(server, (EntityLiving)this); defender = new CraftLivingEntity(server, (EntityLiving)this);
} }
EntityDamagedEvent ede = new EntityDamagedEvent(defender, EntityDamagedEvent.DamageCause.FIRE, i1); EntityDamageEvent ede = new EntityDamageEvent(defender, EntityDamageEvent.DamageCause.FIRE, i1);
server.getPluginManager().callEvent(ede); server.getPluginManager().callEvent(ede);
if (ede.isCancelled()) return; if (ede.isCancelled()) return;

10
src/main/java/net/minecraft/server/Explosion.java
Datei anzeigen

@ -5,9 +5,9 @@ import org.bukkit.craftbukkit.CraftEntity;
import org.bukkit.craftbukkit.CraftLivingEntity; import org.bukkit.craftbukkit.CraftLivingEntity;
import org.bukkit.craftbukkit.CraftPlayer; import org.bukkit.craftbukkit.CraftPlayer;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamagedByBlockEvent; import org.bukkit.event.entity.EntityDamageByBlockEvent;
import org.bukkit.event.entity.EntityDamagedByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamagedEvent; import org.bukkit.event.entity.EntityDamageEvent;
// CraftBukkit end // CraftBukkit end
import java.util.*; import java.util.*;
@ -123,7 +123,7 @@ public class Explosion {
if (e == null) { // Block explosion if (e == null) { // Block explosion
// Craftbukkit TODO: get the x/y/z of the tnt block? // Craftbukkit TODO: get the x/y/z of the tnt block?
EntityDamagedByBlockEvent edbbe = new EntityDamagedByBlockEvent(null, damagee, EntityDamagedEvent.DamageCause.BLOCK_EXPLOSION, damage); EntityDamageByBlockEvent edbbe = new EntityDamageByBlockEvent(null, damagee, EntityDamageEvent.DamageCause.BLOCK_EXPLOSION, damage);
servr.getPluginManager().callEvent(edbbe); servr.getPluginManager().callEvent(edbbe);
if(!edbbe.isCancelled()) entity.a(e, damage); if(!edbbe.isCancelled()) entity.a(e, damage);
} else { } else {
@ -134,7 +134,7 @@ public class Explosion {
} else if (e instanceof EntityLiving) { } else if (e instanceof EntityLiving) {
damager = new CraftLivingEntity(servr, (EntityLiving) e); damager = new CraftLivingEntity(servr, (EntityLiving) e);
} }
EntityDamagedByEntityEvent edbbe = new EntityDamagedByEntityEvent(damager, damagee, EntityDamagedEvent.DamageCause.ENTITY_EXPLOSION, damage); EntityDamageByEntityEvent edbbe = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_EXPLOSION, damage);
servr.getPluginManager().callEvent(edbbe); servr.getPluginManager().callEvent(edbbe);
if (!edbbe.isCancelled()) { if (!edbbe.isCancelled()) {

4
src/main/java/net/minecraft/server/ItemBlock.java
Datei anzeigen

@ -6,7 +6,7 @@ import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.craftbukkit.CraftItemStack; import org.bukkit.craftbukkit.CraftItemStack;
import org.bukkit.craftbukkit.CraftPlayer; import org.bukkit.craftbukkit.CraftPlayer;
import org.bukkit.event.Event.Type; import org.bukkit.event.Event.Type;
import org.bukkit.event.block.BlockPlacedEvent; import org.bukkit.event.block.BlockPlaceEvent;
// CraftBukkit end // CraftBukkit end
public class ItemBlock extends Item { public class ItemBlock extends Item {
@ -81,7 +81,7 @@ public class ItemBlock extends Item {
// CraftBukkit hardcoded Spawn distance for now // CraftBukkit hardcoded Spawn distance for now
boolean canBuild = distanceFromSpawn > 16 || thePlayer.isOp(); boolean canBuild = distanceFromSpawn > 16 || thePlayer.isOp();
BlockPlacedEvent bpe = new BlockPlacedEvent(Type.BLOCK_PLACED, placedBlock, blockClicked, itemInHand, thePlayer, canBuild); BlockPlaceEvent bpe = new BlockPlaceEvent(Type.BLOCK_PLACED, placedBlock, blockClicked, itemInHand, thePlayer, canBuild);
((WorldServer) world).getServer().getPluginManager().callEvent(bpe); ((WorldServer) world).getServer().getPluginManager().callEvent(bpe);
if (bpe.isCancelled() || !bpe.canBuild()) { if (bpe.isCancelled() || !bpe.canBuild()) {

20
src/main/java/net/minecraft/server/NetServerHandler.java
Datei anzeigen

@ -13,8 +13,8 @@ import org.bukkit.craftbukkit.CraftItemStack;
import org.bukkit.craftbukkit.CraftPlayer; import org.bukkit.craftbukkit.CraftPlayer;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.Event.Type; import org.bukkit.event.Event.Type;
import org.bukkit.event.block.BlockDamagedEvent; import org.bukkit.event.block.BlockDamageEvent;
import org.bukkit.event.block.BlockRightClickedEvent; import org.bukkit.event.block.BlockRightClickEvent;
import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.event.player.PlayerItemEvent; import org.bukkit.event.player.PlayerItemEvent;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
@ -291,13 +291,13 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
if (packet14blockdig.e == 0) { if (packet14blockdig.e == 0) {
if (i2 > 16 || flag) { if (i2 > 16 || flag) {
if(blockId > 0) { if(blockId > 0) {
BlockDamagedEvent event; BlockDamageEvent event;
// If the amount of damage that the player is going to do to the block // If the amount of damage that the player is going to do to the block
// is >= 1, then the block is going to break (eg, flowers, torches) // is >= 1, then the block is going to break (eg, flowers, torches)
if (damage >= 1.0F) { if (damage >= 1.0F) {
event = new BlockDamagedEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.BROKEN, player); event = new BlockDamageEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.BROKEN, player);
} else { } else {
event = new BlockDamagedEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.STARTED, player); event = new BlockDamageEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.STARTED, player);
} }
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
@ -309,7 +309,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
// CraftBukkit start - Get last block that the player hit // CraftBukkit start - Get last block that the player hit
// Otherwise the block is a Bedrock @(0,0,0) // Otherwise the block is a Bedrock @(0,0,0)
block = (CraftBlock) player.getWorld().getBlockAt(lastX, lastY, lastZ); block = (CraftBlock) player.getWorld().getBlockAt(lastX, lastY, lastZ);
BlockDamagedEvent event = new BlockDamagedEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.STOPPED, player); BlockDamageEvent event = new BlockDamageEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.STOPPED, player);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
e.c.a(); e.c.a();
@ -318,13 +318,13 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
} else if (packet14blockdig.e == 1) { } else if (packet14blockdig.e == 1) {
if (i2 > 16 || flag) { if (i2 > 16 || flag) {
// CraftBukkit start // CraftBukkit start
BlockDamagedEvent event; BlockDamageEvent event;
// If the amount of damage going to the block plus the current amount // If the amount of damage going to the block plus the current amount
// of damage is greater than 1, the block is going to break. // of damage is greater than 1, the block is going to break.
if (e.c.d + damage >= 1.0F) { if (e.c.d + damage >= 1.0F) {
event = new BlockDamagedEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.BROKEN, player); event = new BlockDamageEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.BROKEN, player);
} else { } else {
event = new BlockDamagedEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.DIGGING, player); event = new BlockDamageEvent(Type.BLOCK_DAMAGED, block, BlockDamageLevel.DIGGING, player);
} }
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
@ -439,7 +439,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
// CraftBukkit start - spawn proection moved to ItemBlock!!! // CraftBukkit start - spawn proection moved to ItemBlock!!!
CraftItemStack craftItem = new CraftItemStack(itemstack); CraftItemStack craftItem = new CraftItemStack(itemstack);
CraftPlayer player = new CraftPlayer(server, e); CraftPlayer player = new CraftPlayer(server, e);
BlockRightClickedEvent brce = new BlockRightClickedEvent(Type.BLOCK_RIGHTCLICKED, blockClicked, blockFace, craftItem, player); BlockRightClickEvent brce = new BlockRightClickEvent(Type.BLOCK_RIGHTCLICKED, blockClicked, blockFace, craftItem, player);
server.getPluginManager().callEvent(brce); server.getPluginManager().callEvent(brce);
e.c.a(((EntityPlayer) (e)), ((World) (d.e)), itemstack, l, i1, j1, k1); e.c.a(((EntityPlayer) (e)), ((World) (d.e)), itemstack, l, i1, j1, k1);

0
src/main/java/org/bukkit/craftbukkit/CraftWorld.java Ausführbare Datei → Normale Datei
Datei anzeigen