Commit graph

374 commits

Author SHA1 Message Date
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
Dinnerbone
e4a31ce206 Implemented BlockState MaterialData 2011-01-15 19:53:33 +00:00
speakeasy
55959488a9 Added kick player 2011-01-15 12:26:24 +08:00
Dinnerbone
80707c0a23 Various fixes; boats, minecarts, musicblocks 2011-01-14 21:22:14 +00:00
Dinnerbone
5cb6edd5a9 Really fixed block placement... Really. 2011-01-14 20:27:11 +00:00
Dinnerbone
202e44ab1a Fixed blocks not keeping data on placement 2011-01-14 19:44:11 +00:00
Dinnerbone
fe4d5db0e0 Fixed levers + buttons 2011-01-14 16:11:04 +00:00
Dinnerbone
dea7d3a81d Update to Minecraft Server 1.2_01 2011-01-14 13:47:47 +00:00
Dinnerbone
2761b59845 Update to Minecraft Server 1.2 2011-01-14 13:31:10 +00:00
sk89q
e6e50ddf9b Fixed Vehicle.eject() not ejecting players properly. 2011-01-12 22:40:06 -08:00
Tahg
be6cd7ed9c add redstone hooks 2011-01-12 12:41:32 -05:00
Taylor Kelly
45bac533be Merge branch 'eggThrown' of https://github.com/tkelly910/CraftBukkit into tkelly910-eggThrown 2011-01-11 18:55:54 -05:00
Erik Broes
9922c69d69 Small whitespace/warning sanitation 2011-01-11 23:11:10 +01:00
Taylor Kelly
6a34f200ae updated EntityEgg 2011-01-11 03:44:39 -05:00
Erik Broes
22dab8e985 Updated against new mc-dev format, takes out quite some casting troubles at the cost of extra ()'s 2011-01-11 09:27:35 +01:00
Taylor Kelly
94bccb6f92 EggThrown
Event
2011-01-11 03:25:49 -05:00
Taylor Kelly
75654e8db5 Fixed BROKEN spamming 2011-01-10 21:05:45 -05:00
sk89q
dda7ca0059 Fixed CraftWorld.spawnArrow() not setting X, Y, Z positions correctly. 2011-01-10 14:14:26 -08:00
speakeasy
5993b21b88 Fixed file name mismatch :(
Signed-off-by: speakeasy <mekevin1917@gmail.com>
2011-01-11 05:45:59 +08:00
speakeasy
6a15ae252b Clean up and fix bug in NetworkAcceptThread and NetworkListenThread classes.
Signed-off-by: speakeasy <mekevin1917@gmail.com>
2011-01-11 05:34:52 +08:00
speakeasy
802a46a709 Added hooks for BlockIgniteEvent
Signed-off-by: speakeasy <mekevin1917@gmail.com>
2011-01-11 05:25:09 +08:00
Erik Broes
136ad76e6a Remember, minimal diffs and *NO TABS* 2011-01-10 09:30:34 +01:00
Taylor Kelly
b1ee09f733 Fixed NPE 2011-01-09 22:42:50 -05:00
Dinnerbone
11b114ca16 Revert "Bukkit Timers, now with 100% less github-services branch."
This reverts commit 7c37a03a092be7e9c3fb242b4cbe4f6644899af6.
2011-01-10 03:09:41 +00:00
Taylor Kelly
0a15f98a2e Fixed CIP 2011-01-10 11:05:42 +08:00
Taylor Kelly
750cc107ae Fixed NPE 2011-01-10 11:05:41 +08:00
Taylor Kelly
c6d80df80d Fixed EntityZombie 2011-01-10 10:50:31 +08:00
thylordroot
e91d523642 Bukkit Timers, now with 100% less github-services branch. 2011-01-10 10:32:09 +08:00
Taylor Kelly
e5d7a46029 - 2011-01-10 10:29:21 +08:00
Taylor Kelly
21e7f1c440 BlockDamagedEvent 2011-01-10 09:49:54 +08:00
Taylor Kelly
103d4ee887 EntityCombustEvent 2011-01-10 09:46:57 +08:00
Erik Broes
814967ddd2 PlayerInventory.getSize should not count armor slots. 2011-01-10 00:41:22 +01:00
Erik Broes
4eeceacde7 Fixed some bugs with inventory 2011-01-09 23:41:14 +01:00
Tahg
d3b87965c3 Merge branch 'master' of https://github.com/Bukkit/CraftBukkit 2011-01-09 15:01:25 -05:00
Tahg
45c7013116 Added function to get player ip 2011-01-09 15:01:09 -05:00
durron597
3d8263f9f8 Tahg's fix for BlockDoor needs to downcast 2011-01-09 13:15:45 -05:00
Erik Broes
e8a565e6cf Added getContents() to IInventory and implemented it.
Implemented Inventory and PlayerInventory and updated StorageMinecart and Slot.
Added getMaxStackSize to CraftItemStack.
2011-01-09 18:28:46 +01:00
durron597
db31429871 Another dumb bucket bug. 2011-01-09 03:36:52 -05:00
durron597
3e71c0a699 Fixed stupid bug with buckets and signs. 2011-01-09 03:32:04 -05:00
sk89q
fd20876189 Implemented item drops. 2011-01-08 12:48:45 -08:00
sk89q
e83d9f676d Changed Block.setTypeID() to return a boolean indicating whether the block was changed (as provided by Minecraft). 2011-01-08 12:24:39 -08:00
durron597
eb4b30185f Added BLOCK_INTERACT event 2011-01-08 08:33:54 -05:00
durron597
fab66092e2 Fixed lack of calling callEvent(event), finished Item Use 2011-01-08 06:18:05 -05:00
durron597
65c8df24b6 Partial Player Item, Block RightClick, Block Place 2011-01-08 05:50:35 -05:00
Dinnerbone
f71e2b4ed3 Implemented block.getBiome 2011-01-08 03:44:29 +00:00
Dinnerbone
603156ea29 Added World.getName and World.getId 2011-01-08 02:29:57 +00:00
Dinnerbone
81f920d927 Added Entity.teleportTo(Entity) 2011-01-08 02:20:11 +00:00
Dinnerbone
860e1b762d Fixed block type/data not updating with the world 2011-01-08 02:03:41 +00:00
Dinnerbone
d374bff8d0 Implemented BlockState.update(boolean), signs should now work, cleaned up some code a little 2011-01-08 01:22:17 +00:00
sk89q
c9efe94545 Added passenger methods to Vehicle/LivingEntity. 2011-01-07 16:26:08 -08:00
sk89q
e968096fc7 Changed resolution order in CraftWorld.toCraftEntity() to give CraftMappable precedence. 2011-01-07 14:06:08 -08:00
sk89q
6d6668aaeb Implemented World.spawnBoat(), added CraftMappable interface that defines a method to get an org.bukkit.craftbukkit.CraftEntity from implementing net.minecart.server.Entity entities, changed CraftWorld.toCraftEntity() to use this new interface for boats and minecarts. 2011-01-07 14:01:37 -08:00
sk89q
eb2cc2da4a Moved CraftVehicle.*Velocity() to CraftEntity as velocity is a component of all entities. 2011-01-07 13:40:16 -08:00
sk89q
22c2fdeaf0 Implemented boat, fixed some event issues with minecarts, and implemented the events for boats that were implemented for minecarts. 2011-01-07 13:05:25 -08:00
sk89q
592f510228 Moved some minecart flags that don't belong in the event out of the event. 2011-01-07 12:27:06 -08:00
sk89q
544bd76b13 Implemented more minecart hooks. 2011-01-07 12:17:06 -08:00
sk89q
7722e750ef Updated Minecart/vehicle Bukkit implementation. 2011-01-07 12:07:16 -08:00
sk89q
4de1915f6a Added World.toCraftEntity() to convert Minecraft entities to CraftBukkit entities. 2011-01-07 12:07:16 -08:00
sk89q
65de896c15 Implemented LivingEntity.shootArrow(). 2011-01-07 12:07:16 -08:00
Dinnerbone
55e9522955 Start of update() + added sign 2011-01-07 16:53:16 +00:00
Dinnerbone
08a62e37ac Implemented CraftBlockState 2011-01-07 16:26:06 +00:00
Animosity
1edd1fa0ca Make matchPlayer return only the exact-matched player, if there is one. 2011-01-08 00:14:06 +08:00
Dinnerbone
2e0413558f Use the display format defined by plugins 2011-01-07 13:35:10 +00:00
Dinnerbone
e3e8e99fe7 Player display name is shown in chat 2011-01-07 13:35:10 +00:00
Dinnerbone
8c10938f69 Implemented Player.getDisplayName/setDisplayName 2011-01-07 13:35:09 +00:00
durron597
96afc38224 Implemented PlayerItemEvent and PlayerBlockItemEvent 2011-01-07 06:12:25 -05:00
Dinnerbone
c5c7145828 Block.getFace(BlockFace) is an override for Block.getFace(BlockFace, int) 2011-01-07 10:48:09 +00:00
Dinnerbone
14b929f382 Added block.getFace(Block) and block.getFace(BlockFace, int) 2011-01-07 10:43:51 +00:00
Animosity
7d12239ab7 Better implementation of matchPlayer(String) - return List of potential matches 2011-01-07 17:53:19 +08:00
Animosity
1e3c5a393b Added CraftServer.matchPlayer(String) - partial-name matching 2011-01-07 17:53:18 +08:00
FrozenCow
6a786c1c21 Fixed plugins being loaded before world. 2011-01-07 17:52:10 +08:00
durron597
687ae0533c Create a concept of a null item stack 2011-01-06 06:26:12 -05:00
Tahg
95c53f09fc Fixed CraftPlayer.isOnline 2011-01-06 02:50:44 -05:00
Dinnerbone
a0c449559a Show reason for invalid plugin 2011-01-05 22:56:31 +00:00
durron597
72c378f1d1 Merge remote branch 'upstream/master' 2011-01-05 08:17:34 -05:00
durron597
b73e343dc1 fixed bug where water wasn't flowing 2011-01-05 08:16:44 -05:00
FrozenCow
786488603e Added Server.getTime and Server.setTime 2011-01-05 18:57:35 +08:00
Animosity
4792d55a08 Actually allow cancellation of player chat events 2011-01-05 18:56:59 +08:00
durron597
8e66e52958 fixed bug where water wasn't flowing 2011-01-05 05:33:32 -05:00
durron597
0aa7b970ad Merge remote branch 'upstream/master' 2011-01-05 04:54:39 -05:00
durron597
3df833797b Beginnings of block_placed 2011-01-05 04:54:23 -05:00
Erik Broes
25d519aaf2 Initial implementation of inventory stuff, (read-)only for StorageMinecart sofar 2011-01-05 01:00:57 +01:00
Dinnerbone
3dbacbc2c3 Implemented LEAVES_DECAY 2011-01-04 22:09:40 +00:00
Dinnerbone
8c9f1090a4 More NPEs! 2011-01-04 21:19:43 +00:00
Dinnerbone
4a9c761707 Fixed random NPE on startup 2011-01-04 21:13:59 +00:00
Dinnerbone
ca765c3512 Fixed building in water 2011-01-04 16:17:05 +00:00
Dinnerbone
1ed14de10e Implemented CHUNK_LOADED 2011-01-04 15:54:41 +00:00
Dinnerbone
a2c944d3c0 Implemented Chunk.getWorld() 2011-01-04 14:17:05 +00:00
durron597
4c483edf08 Merge remote branch 'upstream/master' 2011-01-03 20:21:02 -05:00
Dinnerbone
8680ee387f Added -w for world directory 2011-01-04 01:19:26 +00:00
Dinnerbone
e3b3dcfde5 Merge branch 'master' of github.com:Bukkit/CraftBukkit 2011-01-04 00:45:10 +00:00
Dinnerbone
7b08efd9d9 Added command-line arguments, forced nogui 2011-01-04 00:43:23 +00:00
FrozenCow
43db386fe4 Added getHighestBlockYAt 2011-01-04 06:08:14 +08:00
durron597
8a717dddad Merge remote branch 'upstream/master' 2011-01-03 15:48:56 -05:00
Dinnerbone
b7f7c3ffb5 Fixed NPE on Player related methods in CraftServer 2011-01-03 19:41:23 +00:00
Dinnerbone
fd5892db51 Fixed compile errors 2011-01-03 16:37:08 +00:00
angelsl
d6aff66290 Direct fire exposure event 2011-01-03 16:20:36 +00:00
angelsl
7a9de3159b Explosion damage entity hook. 2011-01-03 16:20:36 +00:00
angelsl
baf59f7451 Cactus damage event. 2011-01-03 16:20:36 +00:00
angelsl
8f358b4b2b Mark CraftEntity as abstract, add dummy health methods to CraftArrowEntity. 2011-01-03 16:20:36 +00:00
sk89q
5a9b2d0c2e Added LivingEntity.throwEgg() and LivingEntity.throwSnowball(). 2011-01-03 23:17:14 +08:00
Dinnerbone
497de4d81c Fixed missing import for craftworld 2011-01-03 15:13:29 +00:00
sk89q
198ffee203 Implemented some minecart vehicle hooks, but there's a some things missing in CraftBukkit before the implementation can be finished. 2011-01-03 14:54:20 +00:00
sk89q
9d68035410 Added minecart classes and World.spawn*Minecart(). Minecart.getPassenger() is still a stub that needs to be implemented (due to of a need of a MC entity -> CraftBukkit entity lookup) and StorageMinecart.getInventory() is waiting on the implementation of inventory. 2011-01-03 14:54:20 +00:00
sk89q
ca47ccf674 Renamed ArrowEntity->Arrow to be consistent. 2011-01-03 22:15:26 +08:00
durron597
a712a74c23 Merge remote branch 'upstream/master' 2011-01-02 22:31:39 -05:00
durron597
f481184612 fixed spelling error in comment 2011-01-02 22:31:32 -05:00
Dinnerbone
31c5894743 Light levels are bytes 2011-01-03 03:27:47 +00:00
Dinnerbone
7ecc3d5b4b Fixed isChunkLoaded(Chunk chunk) 2011-01-03 03:27:47 +00:00
sk89q
b2812b74d4 Added world.spawnTree(), world.spawnBigTree(). 2011-01-03 03:27:47 +00:00
sk89q
fe34bbbb10 Block.getLightLevel() 2011-01-03 03:27:47 +00:00
Dinnerbone
853d00fe98 Changed to pluginmanager direct for enabling plugins 2011-01-03 02:40:47 +00:00
Dinnerbone
c7b0db5f50 Enable plugins by default the right way 2011-01-03 02:25:09 +00:00
Dinnerbone
620c42b321 Added getPlayer(String name) to server 2011-01-03 00:16:00 +00:00
durron597
904c220d5c Removed @Override for the interface method spawnArrow 2011-01-02 05:54:16 -05:00
durron597
1c5d80a8ce Merge remote branch 'upstream/master' into HEAD 2011-01-02 05:50:26 -05:00
durron597
e708281250 Added notchToBlockFace convenience method 2011-01-02 05:29:51 -05:00
sk89q
8222af3e4d Implemented arrows. 2011-01-02 16:58:01 +08:00
durron597
54c2780d1b Merge remote branch 'upstream/master' 2011-01-02 02:16:48 -05:00
Lymia
32224b916d Fixed a bunch of warnings. 2011-01-02 00:36:27 -06:00
durron597
c80748c8cc Changed BLOCK_CANBUILD to have some checks that user can't override
(building on top of themselves, for example)
2011-01-01 18:48:58 -05:00
durron597
cb7e2ee234 Changed commenting to use the system of writing XXX for methods that
we copied out of World.java
2011-01-01 18:36:24 -05:00
durron597
ce271f8abc Changed base of the source file to be based off of grum/mc-dev:
net/minecraft/server/BlockFlowing.java
2011-01-01 18:14:26 -05:00
durron597
f199cc7190 Changed tabs to 4 spaces, removed unnecessary imports 2011-01-01 08:06:04 -05:00
Erik Broes
84bf373c55 Transition to Maven 2011-01-01 11:47:24 +01:00