13
0
geforkt von Mirrors/Paper
Commit graph

920 Commits

Autor SHA1 Nachricht Datum
EvilSeph
e79139d3f2 Save player data on save-all. 2011-02-04 22:49:24 -05: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
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
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
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
923ab54e38 Don't hate me :( 2011-02-01 11:43:31 +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
0dd9e4873d Fixed BLOCK_DAMAGED 2011-01-31 00:02:47 +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
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
Taylor Kelly
cab61f169e onDisable on stop - stephank 2011-01-27 16:15:41 -05:00
Taylor Kelly
f11e575a72 BlockBurnEvent 2011-01-26 16:13:27 -05: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
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
Andrew Ardill
1cbde901ba Entity audit. Adds checks for null entities, and adds conformity. 2011-01-21 16:54:30 +11: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
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
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
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
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
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
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
VictorD
7ea93a1105 Added registration of plugin commands on plugin load. 2011-01-16 16:35:37 +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
5dafc601db Moved org.bukkit.Vector to org.bukkit.util. 2011-01-15 13:44:22 -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
2fe673741c All inventory stuff in org.bukkit.craftbukkit moved to org.bukkit.craftbukkit.inventory 2011-01-15 21:29:17 +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
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
dea72d6623 Global ID -> Id rename 2011-01-15 20:55:59 +01: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
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
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
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
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
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
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
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
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
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
durron597
96afc38224 Implemented PlayerItemEvent and PlayerBlockItemEvent 2011-01-07 06:12:25 -05:00
FrozenCow
6a786c1c21 Fixed plugins being loaded before world. 2011-01-07 17:52:10 +08: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
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
7b08efd9d9 Added command-line arguments, forced nogui 2011-01-04 00:43:23 +00:00
Dinnerbone
b7f7c3ffb5 Fixed NPE on Player related methods in CraftServer 2011-01-03 19:41:23 +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
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
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