Commit graph

374 commits

Author SHA1 Message Date
Tahg
d59a2332fb Merge branch 'master' of https://github.com/Bukkit/CraftBukkit 2011-02-05 00:03:01 -05:00
Tahg
2c798a9e9b Fix for multi-stack adds 2011-02-05 00:02:09 -05:00
EvilSeph
e79139d3f2 Save player data on save-all. 2011-02-04 22:49:24 -05:00
Erik Broes
be10e54235 Fixed NPE on missing kick-reason - http://redmine.bukkit.org/issues/359 2011-02-04 23:02:52 +01:00
VictorD
059d23b4c9 Half-step placement bug fix, all credits to Brettflan 2011-02-03 22:34:22 +01:00
Brettflan
2f2bc28915 Fixes placement cancellation of single-step blocks, such as in protected areas like the spawn area.
The first line edited fixes it so other blocks placed on a single-step block aren't considered (only single-step blocks), and so that they're only considered when placed on the top face of the existing single-step block.
The second section of changed code keeps the final world.setTypeIdAndData() call from being incorrectly applied if it was indeed a single-block placed on an existing single-block.

Best way to test before and after is to put a bunch of single-step blocks in the spawn area as an Op, then de-Op yourself and try placing more blocks (single-step and otherwise, for example I also tested dirt blocks) on the sides and tops of the ones which you previously added as an Op.
2011-02-03 22:07:34 +01:00
Warren
dde3f5b474 Removed tab on line 97. 2011-02-03 12:57:17 -08:00
Limb
e77b080d83 Implemented Inventory.contains with a minimum amount of item required. As per feature request #187 2011-02-04 04:04:16 +08:00
Dinnerbone
c1c61b73c9 Totally useless commit to satisfy lukegb's outrageous demands 2011-02-02 18:23:19 +00:00
Erik Broes
04be2b9b31 Generic cleanup/reformat. 2011-02-02 00:39:08 +01:00
Erik Broes
001a45804e Clean vehicle code. 2011-02-02 00:29:37 +01:00
Erik Broes
1dac92a766 Update chunk handling. 2011-02-02 00:29:37 +01:00
Dinnerbone
21b8ef4435 Added CraftNoteBlock.play 2011-02-01 23:18:25 +00:00
Dinnerbone
e0416ca7fb Added CraftDispenser.dispense() 2011-02-01 23:18:11 +00:00
Forsaken
d228e0c311 Fixed the onDisable() event of plugins again after it was overwritten some days ago. 2011-02-02 06:12:35 +08:00
Dinnerbone
661f209b7e Fixed dispenser 2011-02-01 22:01:37 +00:00
Dinnerbone
f8cdbe1d82 Fixed tabs 2011-02-01 21:55:30 +00:00
Luke GB
3a3a0e6169 Introduce better versioning system, mark 2. 2011-02-01 21:48:21 +00:00
Tyler
eea070ed85 Dispensers now obey BLOCK_INTERACT 2011-02-02 05:29:12 +08:00
Erik Broes
5c467e941b Actually implement the spiral stuff now, oops 2011-02-01 21:40:52 +01:00
Erik Broes
a3fbada1e8 Chunkloading around player now happens in a spiral! No more floating over the void waiting for the floor to load! 2011-02-01 20:26:47 +01:00
Dinnerbone
21b8c16886 Commands can be sent from the console (WIP, needs improvements) 2011-02-01 18:13:12 +00:00
Dinnerbone
657913faeb Dinner time! 2011-02-01 14:53:39 +00:00
Dinnerbone
923ab54e38 Don't hate me :( 2011-02-01 11:43:31 +00:00
Dinnerbone
743ff05b2e Added setItemStack(ItemStack stack) to CraftItemDrop 2011-02-01 10:43:16 +00:00
Dinnerbone
24f140d1f4 Implemented VEHICLE_UPDATE 2011-02-01 10:20:18 +00:00
Dinnerbone
2b0ab5a130 Fixed VEHICLE_MOVE 2011-02-01 10:14:59 +00:00
Dinnerbone
408ed37a01 Implemented VEHICLE_EXIT 2011-02-01 10:02:43 +00:00
Dinnerbone
6f13c9dc55 Implemented VEHICLE_COLLISION_BLOCK 2011-01-31 22:25:27 +00:00
Dinnerbone
82febb3887 ENTITY_DAMAGED now knows hot from wet 2011-01-31 21:50:28 +00:00
Dinnerbone
c2fdd5cadd Implemented PLAYER_ITEM_HELD 2011-01-31 01:35:29 +00:00
Dinnerbone
7369ef7300 Implemented getRemainingAir/setRemainingAir/getMaximumAir/setMaximumAir on LivingEntity 2011-01-31 01:23:10 +00:00
Dinnerbone
c75e53935f Renamed ItemStack.set/getDamage to durability, which is now a short 2011-01-31 01:07:38 +00:00
Dinnerbone
0dd9e4873d Fixed BLOCK_DAMAGED 2011-01-31 00:02:47 +00:00
Dinnerbone
1c9e7f9aee toString! 2011-01-30 22:02:23 +00:00
sk89q
639d3e3f94 Added support for different tree generation types and a callback. 2011-01-30 13:54:43 -08:00
Dinnerbone
1bc9c54233 Implemented ENTITY_DEATH for players 2011-01-30 20:35:08 +00:00
Taylor Kelly
35aac12235 Re-add BlockBurnEvent 2011-01-30 15:30:30 -05:00
Dinnerbone
914688e2a0 Implemented ENTITY_DEATH for monsters and animals 2011-01-30 20:22:09 +00:00
stevenh
0bc5bd54bd Fixed missing PLAYER_JOIN event call 2011-01-30 19:42:39 +00:00
Erik Broes
6c60b54fdf Optimized blockCache, now only stores blocks asked for 2011-01-30 20:19:56 +01:00
Erik Broes
da00e2e3a9 Fixed rogue chmods 2011-01-30 20:18:15 +01:00
Erik Broes
b2a0c5a2ae Reworked getEntity; Hi instanceof, bay 16 classes 2011-01-30 16:15:24 +01:00
VictorD
75ba9a0f25 Fixed initialization of CraftServer 2011-01-30 13:51:20 +01:00
Erik Broes
df69047324 Port to new mc-dev format. 2011-01-30 13:24:39 +01:00
sk89q
d0cd8c6cc7 Fixed drowning damage event. 2011-01-30 01:26:45 -08:00
stevenh
d92376e106 Merge branch 'master' of github.com:Bukkit/CraftBukkit 2011-01-29 21:04:16 +00:00
stevenh
4301a76b31 Updated commands to use CommandSender instead of Player 2011-01-29 21:04:02 +00:00
sk89q
8fdd45ab40 Fixed an issue where fire spread cancellation changed the behavior of natural fire. 2011-01-28 11:39:45 -08:00
sk89q
0daa2420da Fixed fire spread hook providing the wrong block. 2011-01-28 11:39:18 -08:00
sk89q
61c37bd369 Added Block.isBlockPowered(), block.isBlockIndirectlyPowered(). 2011-01-28 10:25:28 -08:00
Dinnerbone
b6b5a1ef77 server.reload() now reloads plugins 2011-01-28 14:18:49 +00:00
Dinnerbone
c2d9af58fe Implemented player.performCommand(String) 2011-01-28 09:15:32 +00:00
Taylor Kelly
cab61f169e onDisable on stop - stephank 2011-01-27 16:15:41 -05:00
Dinnerbone
105a14d6d1 You don't override for interfaces! 2011-01-27 13:26:37 +00:00
Taylor Kelly
f11e575a72 BlockBurnEvent 2011-01-26 16:13:27 -05:00
sk89q
7a898bdba8 Added methods to get a list of entities to World. This replies on net.minecraft.server.Entity.bukkitEntity not being null (otherwise it won't be returned). 2011-01-26 12:48:37 -08:00
Taylor Kelly
c07e32c1de EntityTargetEvent 2011-01-26 14:26:24 -05:00
Dinner Bone
0ba870434e Fixed chunk corruption with mobspawners 2011-01-25 10:14:06 -08:00
Raphfrk
02a1c24746 added load chunk method 2011-01-25 19:11:04 +08:00
VictorD
3477a86995 Added getBlockReplacedState to BlockPlaceEvent, in case one wants to see what type of block was there previously. 2011-01-24 23:22:28 +01:00
sk89q
0675ead169 Added PlayerEggThrowEvent.getEgg(). 2011-01-23 14:06:16 -08:00
sk89q
78db3d2ec4 Added squid as a spawnable type by EntityEgg. 2011-01-23 14:03:25 -08:00
Erik Broes
5f997be0b3 Fixed painting placement 2011-01-23 15:52:23 +01:00
Andrew Ardill
ab3412e878 removed some potential bugs from some items 2011-01-24 00:10:53 +11:00
Andrew Ardill
a809e4e6e3 removed all instances of new CraftEntity* where appropriate.
Entity.getBukkitEntity() is now used instead.
2011-01-23 23:23:13 +11:00
sk89q
9cd81ddd6d Added full tile entity data support for all block types that use it, including chests, dispensers, furnaces, mob spawners, and note blocks. 2011-01-23 00:37:10 -08:00
Erik Broes
e0b04001aa Fixed placement of blocks with meta-data. (Dyed wool, logs etc) 2011-01-22 23:20:07 +01:00
speakeasy
10f46b5fea Fix NPE from location incorrectly being implemented in Explosion. 2011-01-22 11:32:28 +08:00
tahg
8c91ee9c51 Reordered calls to fix use before assignment issue 2011-01-21 18:46:15 -08:00
sk89q
d98c8e2100 Revert "Entity's bukkitEntity field now holds a CraftEntity by default."
This reverts commit 7a64e864fc481f001812d78cc4d767872c458706.
2011-01-21 18:35:32 -08:00
Dean Bailey
bf9d55d9ed Simple fix for minecart tracks not curving as expected following commit baff42c4d3 2011-01-22 09:03:22 +08:00
Sean Cronin
9c28b2134f Fixes "?" console command. 2011-01-22 08:40:44 +08:00
sk89q
3931be421e Entity's bukkitEntity field now holds a CraftEntity by default. 2011-01-21 16:21:19 -08:00
Adam Tanner
5555265e9b Explosion remembers its Location. 2011-01-22 00:43:04 +08:00
Adam Tanner
2106eeef50 CraftBlock instance getLocation() method. 2011-01-22 00:05:09 +08:00
Andrew Ardill
1cbde901ba Entity audit. Adds checks for null entities, and adds conformity. 2011-01-21 16:54:30 +11:00
sk89q
0357c8f936 Added compass setting methods. 2011-01-20 02:10:32 -08:00
sk89q
62624a0799 Added suffocation damage as an event. 2011-01-20 02:10:32 -08:00
sk89q
62344b57f2 Expanded scope of change comments. 2011-01-20 02:10:32 -08:00
sk89q
d3e8f792e5 Added fall damage event. 2011-01-20 02:10:31 -08:00
Andrew Ardill
11de6b91da Fixes to projectile events to check for null entities. 2011-01-20 20:26:19 +11:00
Dinnerbone
cbebfbd6da Implemented server reload 2011-01-20 03:53:43 +00:00
Dinnerbone
45381e17dc Fixed half-step placing 2011-01-20 02:13:51 +00:00
FeepingCreature
2c5dd11c62 Cleared up spawn distance calculation. 2011-01-20 08:58:08 +08:00
FeepingCreature
0e821e60c9 Implement getSpawnLocation(). 2011-01-20 08:58:08 +08:00
Dinnerbone
bded4fb316 Fixed CLI arguments 2011-01-20 00:41:35 +00:00
Dinnerbone
46e1b54a74 Fixed blockcache being inaccurate 2011-01-20 00:17:44 +00:00
Nathan Wolf
0284663aee Address Feature#105:Implement support for PLAYER_ANIMATION hook/event.
Requires corresponding Bukkit change.

NOTE: The email address of this commit used to be: "Nathan Wolf < <nteske@gmail.com>"
      This has been fixed but will cause all commits after to change.
2014-09-09 13:13:36 +02:00
Uristqwerty
55b619a39b Probable fix for Bug #231. 2011-01-20 10:34:08 +11:00
Andrew Ardill
8bbb0749ef fixes some explosion events to stop accessing null entities.
Placed some tags against some spammy events.
2011-01-20 07:01:45 +08:00
speakeasy
e93061be48 Fix up NPE's in EntityMinecart/CraftVehicle and removed a little un-needed code in EntityArrow 2011-01-20 05:52:36 +08:00
speakeasy
eabdc7ffa9 Fix for NPE with dispenser+arrow bug. 2011-01-20 04:17:38 +08:00
speakeasy
bdd3c4dabe Change block ignite in flint and steel to be seperate from item use 2011-01-19 09:00:56 +08:00
Tahg
abb3c5eee6 reverted # from server console 2011-01-18 19:42:49 -05:00
Andrew Ardill
eace2d0f8a Further fixes to fire events
Moved lava ignition event into the correct position.
Spam should be reduced significantly.
2011-01-19 07:51:28 +08:00
speakeasy
abc4b35bcd Fix BlockIgniteEvent after someone updated it and missed some stuff. 2011-01-19 05:04:50 +08:00
Erik Broes
90c52739c4 Fixed getChunkAt and usage. 2011-01-18 12:38:41 +01:00
Andrew Ardill
3143e503fe Fix to slow fire spread hook, to check if a block is on fire before
trying to set it on fire.
2011-01-18 19:44:32 +11:00
Andrew Ardill
e275f727d0 small change to block event with lava and cactus, to improve
readability and consistency
2011-01-18 18:29:41 +11:00
Andrew Ardill
26a590f030 fixed imports on all Entities 2011-01-18 17:16:05 +11:00
Andrew Ardill
d7d7a68f91 fixes to combust event so that it is raised only once on combustion.
minor fixes to imports
2011-01-18 16:30:01 +11:00
Andrew Ardill
ddc30dd6e3 Fixing some entity damage events 2011-01-18 13:49:33 +11:00
VictorD
8088a329cd Updated plugin commands to allow for aliases and fallback on name collision. 2011-01-18 01:13:45 +01:00
Erik Broes
73d6070d88 Fixed: http://redmine.bukkit.org/issues/204 - fixed armor-slot order. 2011-01-18 00:46:03 +01:00
Tahg
19e98ffc71 fixed exact name matching 2011-01-17 16:55:48 -05:00
Tahg
1b7279b7c6 Merge branch 'master' of https://github.com/Bukkit/CraftBukkit 2011-01-17 16:46:40 -05:00
Tahg
c20a40a581 fixed health 2011-01-17 16:45:20 -05:00
Tahg
42099e7379 allowed partial name matching 2011-01-17 15:50:37 -05:00
speakeasy
14d412e82c EntityExplodeEvent commit for craftbukkit. 2011-01-18 04:16:50 +08:00
Tahg
ca9d523646 moved built in command namespace, fixed EntityItem 2011-01-17 14:35:42 -05:00
Andrew Ardill
c862626c02 Depreceated getCraftEntity() as it has been superceded by
getBukkitEntity()
2011-01-18 00:13:34 +08:00
Andrew Ardill
6a3b096fb8 Addition of all Entity classes.
Each Entity creates a corresponding instance of a Craft Entity, to be
used whenever sending instances to an event handler with
getBukkitEntity().
2011-01-18 00:13:33 +08:00
Andrew Ardill
431f2f62cf New Entity Classes implementing the new Bukkit interfaces. 2011-01-18 00:13:33 +08:00
Andrew Ardill
5209e17e1b Adding all Entities into CraftBukkit.
These are needed to properly allow for determining class type, in
accordance with current practice.
2011-01-18 00:13:32 +08:00
Andrew Ardill
5f2c8108b7 Updates to all Entities to use getBukkitEntity() any time an event is
raised.
Similar update to CraftVehicle and CraftLivingEntity
2011-01-18 00:13:32 +08:00
Andrew Ardill
3400eafaf1 added handling of powered and storage minecarts 2011-01-18 00:13:32 +08:00
Andrew Ardill
2de3e2e7e4 created getBukkitEntity() in minecraft.server.Entity
This returns a protected field that is set in the constructor of each
minecraft.server.Entity to a new CraftEntity of some specific type.
2011-01-18 00:13:31 +08:00
unknown
95cb03b50e Fixed melee knockback/sheep shearing 2011-01-17 09:48:35 +08:00
Erik Broes
80a59397cb Updated CraftInventory to make use of the proper generics in the Inventory interface.
Updated loads of return values to now return actual Craft* objects.
Added a shitton of constructors to CraftItemStack so you can now finally properly make your ItemStacks.
2011-01-17 01:55:53 +01:00
Erik Broes
0c492912de Updated CraftHumanEntity to refresh the inventory on death, should fix odd behavior around that. 2011-01-17 01:55:18 +01:00
sk89q
74d746b6c5 Fixed error in CraftInventory.setContents(). 2011-01-16 13:29:43 -08:00
Erik Broes
d048167d16 Fixed removeItem implementation 2011-01-16 16:39:11 +01:00
VictorD
7ea93a1105 Added registration of plugin commands on plugin load. 2011-01-16 16:35:37 +01:00
Erik Broes
78cd77ef71 Implement removeItem(ItemStack...) 2011-01-16 16:09:59 +01:00
Erik Broes
d85a28e97e Remove some debug messages, again, last time >.> 2011-01-16 14:52:55 +01:00
Erik Broes
0ae550a11c Fixed NPE while clearing a slot 2011-01-16 14:34:31 +01:00
Andrew Ardill
ceaf94d5bb Implementation of the EntityDamage*Events.
Many files were added to enable the correct hooking of these events, and a new
event EntityDamageByProjectileEvent. EntityDamageByProjectileEvent adds the
ability to get the projectile entity (such as an egg) and also set if the
projectile 'bounces'. Only two projectiles currently respond to bouncing, Arrow
and Fish - were if the fish bounces it means the fish is not hooked. Bouncing
is independent of any damage caused via the event. In addition, the changes to
EntityDamageEvent that enable setting post-event damage were implemented in all
hooks.

Finally, a bug in CraftArrow was fixed, where the constructor was not declared public.
2011-01-16 14:14:30 +01:00
sk89q
807de6ee22 Moved the source block definition higher in BlockFlowing to ensure its accuracy. 2011-01-15 21:11:26 -08:00
sk89q
9e65c243e4 Fixed an issue where the block cache became out of date and events were giving erroneous block information. 2011-01-15 21:10:24 -08:00
sk89q
c62e387879 Added Block.getRelative(BlockFace). 2011-01-15 19:33:45 -08:00
sk89q
5d93ab3e54 Added item-in-hand related API. 2011-01-15 19:33:28 -08:00
sk89q
44ae0531e7 Added CraftInventory.setContents(); made CraftInventory.setItem(), CraftInventory.getItem(), and CraftItemStack() damage-aware. 2011-01-15 14:56:35 -08:00
Dinnerbone
f78b8c12a6 Fixed compilation issues (+small import cleanup in CraftWorld) 2011-01-15 21:53:09 +00:00
sk89q
7fd0125db5 Fixed World.dropItemNaturally() not specifying the Y and Z coordinates correctly. 2011-01-15 13:45:48 -08:00
sk89q
5dafc601db Moved org.bukkit.Vector to org.bukkit.util. 2011-01-15 13:44:22 -08:00
sk89q
f6d4979aa2 Added Server.broadcastMessage(). 2011-01-15 13:40:35 -08:00
Dinnerbone
4d1c1fe5ed Moved org.bukkit.craftbukkit.Block to org.bukkit.craftbukkit.block.Block 2011-01-15 21:40:18 +00:00
Dinnerbone
0db8d5d111 Moved block stuff from org.bukkit to org.bukkit.block 2011-01-15 21:36:57 +00:00
Dinnerbone
7877229881 Missed an Entity 2011-01-15 21:31:59 +00:00
Dinnerbone
2fe673741c All inventory stuff in org.bukkit.craftbukkit moved to org.bukkit.craftbukkit.inventory 2011-01-15 21:29:17 +00:00
Dinnerbone
6b9ad41a05 All inventory stuff in org.bukkit moved to org.bukkit.inventory 2011-01-15 21:27:29 +00:00
Dinnerbone
9150e8d85d All entity stuff in org.bukkit.craftbukkit moved to org.bukkit.craftbukkit.entity 2011-01-15 21:24:07 +00:00
Dinnerbone
d501bbf1a2 All entity stuff in org.bukkit moved to org.bukkit.entity 2011-01-15 21:21:05 +00:00
Erik Broes
34674e7793 Remove debug stuff, oops 2011-01-15 22:13:24 +01:00
Erik Broes
4dc907f2f6 Implemented clear/remove for inventories 2011-01-15 21:55:53 +01:00
Erik Broes
8c8f53fd44 Events should be present tense, not paste tense. 2011-01-15 21:26:52 +01:00
Dinnerbone
2184d240db Changed BlockFace enum to match coding standards 2011-01-15 20:19:10 +00:00
Erik Broes
5aa1bc269d Implemented int getBlockTypeIdAt(int x, int y, int z). 2011-01-15 21:01:49 +01:00
Erik Broes
dea72d6623 Global ID -> Id rename 2011-01-15 20:55:59 +01:00