Commit Graph

382 Commits

Author SHA1 Message Date
Erik Broes
50e42496e3 @Override interface implementation is 1.6 exclusively 2011-02-07 11:03:56 +01:00
Dinnerbone
172db788b3 I'm quite aware that I fail at merging. 2011-02-07 01:59:06 +00:00
Dinnerbone
919023fe5d CraftWorld.toString has name 2011-02-07 01:51:07 +00:00
Dinnerbone
3f8d9c0e1f Fixed inventory transition 2011-02-07 01:51:06 +00:00
Dinnerbone
7bdc190637 Possibly fixed block/chunk leaking 2011-02-07 01:51:06 +00:00
Dinnerbone
8b14c72a8d Changes to reflect new Environment enum 2011-02-07 01:51:06 +00:00
Dinnerbone
4e6f4e3031 NPE 2011-02-07 01:51:06 +00:00
Dinnerbone
dcabbda57c Fixed invisibility after cross-world teleportation 2011-02-07 01:51:06 +00:00
Dinnerbone
590b3874a8 Fixed various multiworld teleporting issues 2011-02-07 01:51:05 +00:00
Dinnerbone
4c9f1a2275 Fixed NPE after traveling to another world 2011-02-07 01:51:05 +00:00
Dinnerbone
7e81245caf Probably definitely fixed mob leaking 2011-02-07 01:51:05 +00:00
Dinnerbone
ac899e51c1 Possibly fixed world leaks (mobs crossing into other worlds) 2011-02-07 01:51:05 +00:00
Erik Broes
550ad6f9d1 Proper 'otherworld' chunkloading 2011-02-07 01:51:05 +00:00
Dinnerbone
b229931ce6 Attempt to clear loaded chunks during multiworld teleportation 2011-02-07 01:51:05 +00:00
Dinnerbone
bf304ddc43 Fixed player teleportation 2011-02-07 01:45:32 +00:00
Dinnerbone
2be5181b0c Added internal MC support for multiple worlds 2011-02-07 01:44:43 +00:00
Raphfrk
9e7991ab52 Scheduler 2011-02-07 01:03:32 +01:00
Erik Broes
b64667cde4 Remove deprecated [gs]etTime calls 2011-02-06 13:30:50 +01:00
sk89q
4026cd656f Added CraftBlock.getVector(). 2011-02-05 23:19:36 -08:00
Raphfrk
101d01ef64 getLoadedChunks method 2011-02-05 15:06:02 +01:00
EvilSeph
767c15369c Added version output to CraftBukkit that displays on startup.
Add a version display to the startup of CraftBukkit so that we have all
the information we need for support purposes simply by requesting a
server log be pastebinned. I wanted to have it display right after the
official Minecraft version is, but that would require modifying
the server itself.
2011-02-05 03:39:13 -05:00
Animosity
8932430aed Addded: int getMaxPlayers() 2011-02-05 01:36:41 -05:00
tahg
10f4f33ed0 fixed addItem hopefully 2011-02-04 21:38:15 -08:00
Tahg
2c798a9e9b Fix for multi-stack adds 2011-02-05 00:02:09 -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
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
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
Dinnerbone
657913faeb Dinner time! 2011-02-01 14:53:39 +00:00
Dinnerbone
743ff05b2e Added setItemStack(ItemStack stack) to CraftItemDrop 2011-02-01 10:43:16 +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
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
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
Erik Broes
df69047324 Port to new mc-dev format. 2011-01-30 13:24:39 +01: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
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
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
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
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
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
sk89q
3931be421e Entity's bukkitEntity field now holds a CraftEntity by default. 2011-01-21 16:21:19 -08:00
Adam Tanner
2106eeef50 CraftBlock instance getLocation() method. 2011-01-22 00:05:09 +08:00
sk89q
0357c8f936 Added compass setting methods. 2011-01-20 02:10:32 -08:00
Dinnerbone
cbebfbd6da Implemented server reload 2011-01-20 03:53:43 +00:00
FeepingCreature
0e821e60c9 Implement getSpawnLocation(). 2011-01-20 08:58:08 +08:00
Dinnerbone
46e1b54a74 Fixed blockcache being inaccurate 2011-01-20 00:17:44 +00: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
Erik Broes
90c52739c4 Fixed getChunkAt and usage. 2011-01-18 12:38:41 +01: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
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
Andrew Ardill
c862626c02 Depreceated getCraftEntity() as it has been superceded by
getBukkitEntity()
2011-01-18 00:13:34 +08:00
Andrew Ardill
431f2f62cf New Entity Classes implementing the new Bukkit interfaces. 2011-01-18 00:13:33 +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
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
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
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
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
202e44ab1a Fixed blocks not keeping data on placement 2011-01-14 19:44:11 +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
Erik Broes
9922c69d69 Small whitespace/warning sanitation 2011-01-11 23:11:10 +01: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
sk89q
dda7ca0059 Fixed CraftWorld.spawnArrow() not setting X, Y, Z positions correctly. 2011-01-10 14:14:26 -08:00
Erik Broes
136ad76e6a Remember, minimal diffs and *NO TABS* 2011-01-10 09:30:34 +01: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
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
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
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
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
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
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
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
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
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
FrozenCow
786488603e Added Server.getTime and Server.setTime 2011-01-05 18:57:35 +08:00
durron597
0aa7b970ad Merge remote branch 'upstream/master' 2011-01-05 04:54:39 -05:00
Erik Broes
25d519aaf2 Initial implementation of inventory stuff, (read-)only for StorageMinecart sofar 2011-01-05 01:00:57 +01: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
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
Lymia
32224b916d Fixed a bunch of warnings. 2011-01-02 00:36:27 -06: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