Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 03:55:14 +01:00
Code Issues Projects Releases Wiki Activity
1,686 Commits 46 Branches 14 Tags 248 MiB
af0018a962
Commit Graph

1610 Commits

Author SHA1 Message Date
Raphfrk
abf7f8581e Added ability to disable the join/leave notices by setting the message to null in the event. The join message is moved to the onJoinEvent rather than during login 2011-03-26 15:07:55 +01:00
Raphfrk
8e53077efe Switched biome coords from chunk based to block based 2011-03-26 15:05:16 +01:00
Erik Broes
1cbed230d6 Add LEFT_CLICK_BLOCK's face 2011-03-26 09:56:24 +01:00
sk89q
49955d5a1d Added Server.getServerId() for ID purposes. 2011-03-26 01:40:15 -07:00
Erik Broes
1eb2f75f53 Copy displayname when cross-world teleporting 2011-03-25 21:22:57 +01:00
Erik Broes
9162a654c4 Implement player.getCompassTarget 2011-03-25 21:22:03 +01:00
sk89q
6fc4d9dcfe Fixed CraftWorld.getSpawnLocation() not return the exact spawn location. 2011-03-25 12:24:18 -07:00
Erik Broes
95c08f854f Fix inability to use items under certain circumstances 2011-03-25 07:35:47 +01:00
Erik Broes
f330025f1f Fixed unable to eat/throw 2011-03-24 23:27:40 +01:00
Erik Broes
92518f4fc0 Stop GIANT discrimination 2011-03-24 22:51:47 +01:00
Erik Broes
ce714ab329 Fix CreatureType of CreatureSpawn event 2011-03-24 22:44:03 +01:00
Erik Broes
93fff2d5f5 Prevent double CraftWorld for the same world 2011-03-24 22:43:21 +01:00
Erik Broes
69d5132df4 Reset blocks faster clientside 2011-03-24 22:42:23 +01:00
Erik Broes
d6c3fe23e5 Minor logic change and small cleanups 2011-03-24 12:11:28 +01:00
Erik Broes
748b71b3cc Fix accidental Double.MAX_VALUE coordinates in initial PlayerMoveEvent 2011-03-24 00:52:10 +01:00
Erik Broes
3129348866 Implementation of LivingEntity maximumNoDamageTicks, noDamageTicks, lastDamage 2011-03-24 00:32:41 +01:00
Erik Broes
267e745212 Fix 'double RIGHT_CLICK' event on right-clicking a block with a non-interactive object 2011-03-24 00:10:05 +01:00
Raphfrk
0b05cbb998 Updated SoftMap to be concurrent. 2011-03-23 19:37:12 +01:00
Raphfrk
9464602720 Update to PlayerMoveEvent. The From field is set the value of the previous To Field, and, Pitch or Yaw changes of more then 10 degrees will trigger the event 2011-03-23 19:31:30 +01:00
lem21h
fdcf1c3c3a Now also handle entities spawning on a loading a world. (Redacted by Grum) 2011-03-23 19:17:14 +01:00
Nicholas Devenish
15baff8559 Fix the "Ghost minecart" issue. 
This reverts commit 73647864179cbab9f340044e9d33add445fbe774 - "Ignore entity movement packets if distance == 0"

This a commit introduced an intermittent bug which has caused minecart ghosting - they are invisible until you interact with them physically. This is described in leaky bugs:
http://leaky.bukkit.org/issues/547
http://leaky.bukkit.org/issues/563

And caused by the fact that normally when loading a chunk, entities fall with gravity before the block data has been loaded, and are sent a zero-distance packet to reset their positions. See Issue #190:
https://github.com/Bukkit/CraftBukkit/issues/#issue/190
 2011-03-23 18:46:54 +01:00
afforess
69cbe7d222 Allow Vehicle Motion to save properly 2011-03-23 18:43:08 +01:00
Erik Broes
e8e7581446 Small cleanup for the last commit 2011-03-23 18:42:49 +01:00
Byron Shelden
376ac51cea Fixed the PLAYER_TELEPORT event so event.getTo().getWorld() is correct. (#451) 2011-03-23 18:34:53 +01:00
Erik Broes
d08ee17352 Fix doors not updating after opening has been denied 2011-03-23 18:29:43 +01:00
Erik Broes
ca1c9ef2e1 Minor cleanups 2011-03-23 16:51:44 +01:00
Erik Broes
49043a8aff Re-Implement BlockDamage 2011-03-23 16:51:44 +01:00
Erik Broes
f33de669fb Major overhaul implementing PLAYER_INTERACT, removing PLAYER_ITEM, BLOCK_INTERACT, BLOCK_RIGHT_CLICK 2011-03-23 16:51:43 +01:00
Erik Broes
bb9558adec Implement Bucket events 2011-03-21 00:31:15 +01:00
Erik Broes
324efa8224 Fix BlockPlace 2011-03-21 00:31:13 +01:00
Erik Broes
0d2dc3902c Fix BlockCanBuild 2011-03-21 00:30:00 +01:00
Erik Broes
11590f49f0 Redstone torch fix 2011-03-21 00:30:00 +01:00
Erik Broes
437025a179 Fixing event names 2011-03-21 00:30:00 +01:00
Erik Broes
4c420e6aa8 BLOCK_PLACE supports pie, diode and reed 2011-03-18 23:55:37 +01:00
Erik Broes
778079677e Fix BLOCK_PLACED when placing on snow/step 2011-03-18 23:45:46 +01:00
tahg
1144013362 Hacky solution to expose ip. Will fix properly later if I care to give a **** 2011-03-18 00:03:03 -07:00
Erik Broes
f28f3a6a9c BlockInteract fixed for pressure plates 2011-03-17 20:02:15 +01:00
Gunther De Wachter
2ae5b98d10 Added missing EntitySquid, you can now prevent them from spawning! 2011-03-17 20:01:58 +01:00
Gunther De Wachter
41752f401c TNT now gives its entity to the damage handler 2011-03-17 20:01:42 +01:00
Gunther De Wachter
b6f87bb23c Fireballs now give their entity to the damage handler 2011-03-17 20:01:24 +01:00
Gunther De Wachter
d732457354 Implement DamageType.VOID 2011-03-17 20:01:07 +01:00
Tanel Suurhans
28c9439f94 Fixes minecart type reporting for VEHICLE_CREATE. 2011-03-15 07:39:22 -04:00
Raphfrk
6ca1f24ee2 Adds an onLoad method to Plugin. The onLoad method is called for all plugins before the onEnable calls 2011-03-14 14:45:33 +00:00
Raphfrk
4a2bc3299a Fixed setTypeIdAndData sending client updates when not using physics 2011-03-14 11:31:43 +00:00
Raphfrk
7242f21a32 This should fix the chunk ghosting bug 2011-03-14 11:31:43 +00:00
Tahg
9869ace146 fixed redstone torches 2011-03-14 00:48:44 -04:00
Erik Broes
672b06727d Also transfer the displayName when dying 2011-03-13 13:29:52 +01:00
Erik Broes
6043797ce0 Fix getDisplayName getting lost when getBukkitEntity is called 2011-03-13 12:52:01 +01:00
stevenh
1be1b5ab4d Removed CraftBukkit - Removed line from kick fix to help port process 2011-03-12 18:39:38 +00:00
stevenh
07c98ea2a4 Added methods to support RemoteBukkit 
This means all commands even "default" server commands work within the command structure
returning output to the command sender

Updated default kick command to be compatible with kick + msg used by remote tools that work with hMod
 2011-03-12 18:31:44 +00:00
Tahg
ca3d0512f3 Blocks now return power for sources other than redstone dust 2011-03-12 12:28:07 -05:00
Erik Broes
1db4eab7e3 TextWrapper now wraps text at the proper width and also prevent splitting unless it is needed 2011-03-12 16:58:05 +01:00
Erik Broes
7729c8b517 Sourcefiles shouldn't be executable 2011-03-12 16:12:41 +01:00
Erik Broes
22baecaf7f Clean code a bit 2011-03-12 16:12:41 +01:00
sk89q
49a3d5bfb3 Added Player.sendRawMessage(). 2011-03-12 01:06:04 -08:00
Tahg
0ac5c7f4cf fixed diodes 2011-03-12 02:02:25 -05:00
Tahg
79ccc5320a more NPE fixes regarding redstone 2011-03-11 20:47:59 -05:00
Tahg
5c4f1d75b5 stupid ChunkPosition's are relative to the chunk 2011-03-11 17:57:59 -05:00
Tahg
078f48c0fb Code cleanup, fixed doors, chunk entity fetching 2011-03-11 16:25:35 -05:00
Tahg
786fdfb9fe NPE fix in redstone 2011-03-11 00:36:19 -05:00
Tahg
c06f3e0d76 properly implement locks 2011-03-10 21:37:55 -05:00
EvilSeph
c0b3e80d1d Fixing grammar and CraftBukkit comment. 2011-03-10 15:17:01 -05:00
Tahg
803e67d55d Redstone fixes 2011-03-10 13:07:00 -05:00
Tahg
9428907e62 Add redstone events to common blocks 2011-03-10 13:06:59 -05:00
Tahg
39acc5817e Additional hooks for chunks 2011-03-10 13:06:59 -05:00
Tahg
df02c501a4 Additional redstone hooks 2011-03-10 13:05:00 -05:00
Tahg
719038fcee Add non updating type/data sets 2011-03-10 13:05:00 -05:00
Tahg
67cf10656c Add locks to Hashset 2011-03-10 13:04:59 -05:00
Dinnerbone
54a05f3ce2 Attempt to fix double disconnects 2011-03-10 00:16:16 +00:00
Dinnerbone
131a2c769b Slight tweak to EntityPlayer to add toString for name+position for error tracking 2011-03-10 00:02:33 +00:00
Dinnerbone
f040900d3c Attempt to fix console crash 2011-03-09 23:34:26 +00:00
Dinnerbone
0df1d1a101 Changed block cache to soft references (should help a lot with memory usage) 2011-03-09 22:12:28 +00:00
Dinnerbone
507e2be8ea Fixed LOGIN packet issue 2011-03-09 21:45:57 +00:00
Dinnerbone
9aa582885a Fixed exploit allowing people to place blocks anywhere 2011-03-09 20:30:06 +00:00
Andrew Ardill
b819ffe8a4 Implemented LivingEntity.getEyeLocation() 2011-03-09 19:43:43 +00:00
Erik Broes
454da93a00 Record invalid ItemInHandIndex packet 2011-03-09 18:31:45 +01:00
Dinnerbone
f056fad765 Fixed crash with bad holding slot 2011-03-09 16:58:31 +00:00
Dinnerbone
63f0de5128 Sign exploit fix is spammy no more. Probably. 2011-03-09 16:56:22 +00:00
Dinnerbone
c607d212d4 (Probably) fixed the sign exploit 2011-03-08 23:18:14 +00:00
Dinnerbone
cdcb947532 Fixed the fix of the inventory dupe bug 2011-03-08 21:52:17 +00:00
Dinnerbone
7de9091036 Fixed an exploit allowing item duplication upon death 2011-03-08 20:54:52 +00:00
Dinnerbone
e0d8c1d7ac Fixed a minecraft exploit allowing anyone to pick their username 2011-03-08 20:48:47 +00:00
Dinnerbone
e8e74992cb Purged deprecated MobType and MobSpawner 2011-03-07 16:32:41 +00:00
Dinnerbone
6a99d8c412 Implemented LivingEntity.damage 2011-03-07 15:59:10 +00:00
Dinnerbone
03fae0a2f7 Fixed BLOCK_CANBUILD never throwing 2011-03-07 15:49:26 +00:00
Raphfrk
03a5bbc612 Regenerate and refresh chunk methods 2011-03-07 12:34:27 +00:00
Raphfrk
528b9b2e09 Fixed isChunkInUse() 2011-03-07 12:29:37 +00:00
Dinnerbone
44c25340dc Velocity now sends updates to players 2011-03-05 18:48:58 +00:00
VictorD
5636eea877 Updated CraftServer to lowercase r in registerInterface method.. 2011-03-05 12:33:11 +01:00
Dinnerbone
9a64d7ec1b Implemented Entity.get/setMomentum 2011-03-04 14:23:45 +00:00
Dinnerbone
770bb9e3b5 Removed Block.getRawData 2011-03-04 14:20:38 +00:00
Erik Broes
332b0c2ca9 BlockFlowing NPE fix. 2011-03-02 21:27:02 +01:00
tahg
34458efd83 Synchronized EntityTracking 2011-03-02 11:00:16 -08:00
Morgan Humes
9a264ed666 Implements World.save and Server.savePlayers() 2011-03-02 16:51:31 +01:00
Erik Broes
1505b4bf3c RedstoneChange event thrown then the redstone *changes* not when it stays the same :D 2011-03-02 16:36:26 +01:00
Erik Broes
9d9ad6bd1e Java 1.5 compat. 2011-03-02 15:24:17 +01:00
tahg
87dc04b750 limit chunk unloading to 50 per tick 2011-03-02 00:24:22 -08:00
FrozenCow
9832ce06f1 Synchronized and moved Hash classes 2011-03-01 16:37:19 -05:00
VictorD
13fb0e07ce Ignore entity movement packets if distance == 0 2011-03-01 20:54:53 +01:00
Dinnerbone
3dd60c168b Fixed chat 2011-03-01 19:04:16 +00:00
Erik Broes
f54469f314 Let's handle (bwhaha) the Craft* entities a bit better. 2011-03-01 17:08:18 +01:00
SpeaKeasY
e6583c0d48 Added method to set spawn location 2011-03-01 10:39:26 +01:00
Dinnerbone
d142fabfc1 Sped up teleporting even more, + fixed isSneaking 2011-02-28 20:30:33 +00:00
Tanel Suurhans
5f20de34a9 - fix VEHICLE_COLLISION_BLOCK event firing 2011-02-28 16:25:53 +00:00
Tanel Suurhans
df2c0e2308 implement World.getPlayers 2011-02-28 16:20:44 +00:00
Tanel Suurhans
d1e3d01036 - add BedBlock - implement BLOCK_INTERACT for beds 2011-02-28 16:14:12 +00:00
Dinnerbone
016e50e6fc Hacky fix against block invulnerability 2011-02-28 15:59:23 +00:00
Dinnerbone
38c2103ff4 Spiral teleporting! Wheeeee! 2011-02-28 13:21:50 +00:00
Andrew Ardill
76d8016b32 BUGFIX: Damage events should be using getDamage() to set damage. 2011-02-28 17:43:56 +11:00
EvilSeph
41fea9b40e Removing debug statements. 2011-02-28 00:02:36 -05:00
Dinnerbone
ec0dde071d Implemented Server.getPluginCommand 2011-02-28 00:31:25 +00:00
Dinnerbone
b396707cb9 Catch errors loading plugins 2011-02-27 14:55:29 +00:00
Dinnerbone
cb2ff3c8bb Implemented chat recipients 2011-02-26 19:37:19 +00:00
Dinnerbone
bdc8c84041 Removed onCommand 2011-02-26 19:05:20 +00:00
Dinnerbone
d7114a4f62 Fixed empty console! Oops! 2011-02-26 11:51:31 +00:00
Dinnerbone
07b86b1230 Added command line option 'date-format' to control how dates are printed to console (not to log) 2011-02-26 11:29:37 +00:00
Erik Broes
bb8d9fbe9d More PLAYER_ITEM blockFace fixes of static fails; (1!=l) -- Thanks Scient for pointing it out 2011-02-25 23:42:08 +01:00
Erik Broes
88dea6189a Prevent movement event to be spammed for moving less than a pixel. 2011-02-25 22:44:26 +01:00
Erik Broes
78af4f97f9 Startup time now reported in seconds, nanoseconds, Really? O.o 2011-02-25 22:44:25 +01:00
Erik Broes
61339bcb2a Properly handle PLAYER_ITEM and its clickedFace. 2011-02-25 22:44:25 +01:00
Erik Broes
666c968dab Fixed 'sign'-BlockFace (1!=l). 2011-02-25 22:44:25 +01:00
EvilSeph
43e36b5bdc All worlds should be saved on save-all. Player data should be saved when a save occurs. 2011-02-25 14:36:09 -05:00
Dinnerbone
685d4dbb3f Added ">" to input command line, separated it from output buffer properly 2011-02-25 19:01:14 +00:00
Dinnerbone
57338bee52 Much better console interaction. History, no more losing the command, colours, inline editing, etc. Shorter log output to console (but not to file). 2011-02-25 16:12:38 +00:00
Dinnerbone
659fa9eaf9 Temporary fix for teleportation 2011-02-25 12:46:31 +00:00
Tahg
e53fd1367c possible fix for block breaking bug 2011-02-24 22:37:47 -05:00
Dinnerbone
13f55ce0c8 Fixed logging back in on non-default worlds (Yes really) 2011-02-24 15:46:26 +00:00
Dinnerbone
c97fa40d2b Fixed ENTITY_DAMAGE involving slimes (per DHowet) 2011-02-24 12:49:48 +00:00
Dinnerbone
51be9e77c6 Attempt to convert multiworld worlds... world. 2011-02-24 12:07:33 +00:00
Tahg
5d3b8de87a Fixed some debug 2011-02-24 03:51:00 -05:00
Tahg
280880d163 synchronize hashmap lookups 2011-02-23 22:52:14 -05:00
Tahg
edb0debd16 attempt to track down some bugs 2011-02-23 22:36:56 -05:00
stevenh
2db976c840 Corrected Exceptions text when loading and saving ops 2011-02-24 01:18:23 +00:00
Dinnerbone
92cbb2fc23 Fixed CraftItem NPEs 2011-02-23 16:08:28 +00:00
Erik Broes
09aa37fe4a Generic code cleanup 2011-02-23 14:12:33 +01:00
Erik Broes
332d9c4f18 BlockStationary fix 2011-02-23 13:56:43 +01:00
Dinnerbone
bfca34cad4 ConsoleCommandSender no longer has a default constructor, use ConsoleCommandSender(server). Added entity.getServer and updated the version number of mc 2011-02-23 11:33:41 +00:00
speakeasy
6655b89037 possible fix for levers, ladders, and buttons 2011-02-23 11:27:22 +01:00
Dinnerbone
f622db3ea1 Fixed bad cast in EntityItem 2011-02-23 09:17:30 +00:00
Tahg
b8023ac3fa Fix for isOp 2011-02-23 14:08:42 +08:00
Dinnerbone
f759e0b60d Update to Minecraft 1.3 beta 2011-02-23 02:37:56 +00:00
Taylor Kelly
a124bfdab5 Fix PlayerRespawnEvent for multi-worlds 2011-02-22 19:02:06 +01:00
Tahg
96435cfc76 refactor Items 2011-02-21 19:57:23 -05:00
Dinnerbone
f659231e34 N.M.S cleanup in preparation for update 2011-02-21 22:30:01 +00:00
Dinnerbone
67cf646014 Merge branch 'master' of github.com:Bukkit/CraftBukkit 2011-02-21 21:27:01 +00:00
Andrew Ardill
30d1a5d3fd returning if a thread is not alive should happen before any changes to 
the list of workers, hence the return statement should be in the
synchronized block.
 2011-02-21 16:32:41 +11:00
Andrew Ardill
6269c1e633 implementation of isQueued() 2011-02-21 16:32:40 +11:00
VictorD
bf9a55049e Second part of NPE and arctan update :3 2011-02-20 23:22:28 +01:00
VictorD
cec04a7360 Added null pointer check and switched to a faster arctan method 2011-02-20 23:16:05 +01:00
Daniel Chesters
4f249b585c Fix encoding in net.minecraft.server files. 2011-02-20 18:15:21 +01:00
David Flemström
5121ebb65d Fixed issue with color markers in messages sent to the client. 
This fix eliminates crashes related to color markers being at end-of-line, and also makes colors persist across line breaks.

- The broadcast message is split up in multiple packets, one per line
- Color markers are reorganized, so that color 'sticks across lines'
- The wrapping method calculates the *rendered* line length. Thus, if the user has a weird font, it might look weird.
 2011-02-20 18:15:21 +01:00
Erik Broes
09026095b6 Minor cleaning of code 2011-02-20 18:15:17 +01:00
Erik Broes
6e3ee31336 Prevent Blocks from getting lost when a chunk reloads 2011-02-20 17:09:38 +01:00
Tahg
ca4076077e fixed buttons, plates 
added yield to explosion
added event for chunk unloading
 2011-02-19 23:44:35 -05:00
Dinnerbone
a59149c208 Make all new loggers default to the same logging as "Minecraft" (to console + file, same format) 2011-02-20 02:14:15 +00:00
sk89q
d4b67c5549 Lowered the priority of the old command handler event. A number of plugins were using this event incorrectly. A new event, the command preprocesser event, has replaced the previous function of the original command event. 2011-02-19 18:02:13 -08:00
sk89q
acd0344452 Added Entity.remove() which marks an entity for removal. 2011-02-19 18:02:12 -08:00
sk89q
ec0eec5863 Added slime as a detected entity. 2011-02-19 18:02:12 -08:00
Dinnerbone
264b5c331d Redirect System.out and System.err to a Logger 2011-02-20 01:53:06 +00:00
Dinnerbone
a6b3965672 Fixed CLI arguments 2011-02-19 19:45:22 +00:00
EvilSeph
bddceeaf51 When deprecating, the alternative should be provided. 2011-02-19 06:02:27 -05:00
Raphfrk
41fe211919 Added target block ray trace functionality. 2011-02-18 20:48:56 -05:00
Protected
e97889e80a Added setFireTicks(), getFireTicks() and getMaxFireTicks(). 2011-02-18 17:35:59 -05:00
Dinnerbone
7fe0aa7460 Implemented a whole buncha Location overrides in CraftWorld 2011-02-18 16:35:05 +00:00
Dinnerbone
a5ca3e1c12 Don't kick players if a command failed from an exception 2011-02-18 16:25:56 +00:00
EvilSeph
e544fb71c3 Changed hatchingType to MobType from CreatureType as refactoring (and so plugin breaking) will take place in a week. 2011-02-17 03:17:13 -05:00
Andrew Ardill
da6ce2d80e Implementation of spawnCreature(Location, CreatureType) 2011-02-17 17:59:27 +11:00
Andrew Ardill
0703f4f458 Updated to use CreatureType and CreatureSpawner 
Nothing will break as a result of the refactoring of MobType due to
deprecated code being left in. These will be removed after 1 week,
enough time for plugin devs time to migrate.
 2011-02-17 17:57:52 +11:00
sk89q
5f940cf764 Added Player.chat(). 2011-02-16 21:47:01 -08:00
EvilSeph
03c118f343 Added CREATURE_SPAWN event per ss2man44 2011-02-16 22:45:00 -05:00
Andrew Ardill
dc45946163 implementation of isCurrentlyRunning(int taskId); 
Burrows down to the worker thread assigned to this task, and returns
its alive status. If no such thread exists, then the task is not
running!
 2011-02-17 13:27:54 +11:00
Raphfrk
973d61c418 Allows calling of functions in the main thread 2011-02-13 22:12:26 -05:00
Meaglin
4a4b67cc42 Implementation of BlockBreakEvent 2011-02-13 13:19:51 +01:00
Raphfrk
9715e77852 Fixes a deadlock issue in CraftScheduler 2011-02-13 00:55:58 -05:00
Erik Broes
40f7986a11 Make the spawning listen to the server spawn-settings 2011-02-13 01:21:50 +01:00
Stéphan Kochen
f789c9e744 Replace a net.minecraft accessor with a public attr. 2011-02-12 16:17:43 +01:00
afforess
5aa95ee469 Added MaxSpeed methods to minecarts. Added MaxSpeed methods to boats. Added SlowWhenEmpty, FlyingMod, and DerailedMod methods to minecarts. 2011-02-12 16:14:43 +01:00
Andrew Ardill
be9a264249 Fixed bug in event when taking fall damage. Now uses event damage. 2011-02-12 22:40:28 +11:00
culturespy
e2899b9dd7 Added EXPLOSION_PRIMED event. 2011-02-12 02:57:58 -05:00
Timberjaw
348e6c75c7 Added SIGN_CHANGE event. 2011-02-11 20:49:09 -05:00
Andrew Ardill
c097fd9ac5 Added implementation of Colorable to CraftSheep 
inspired by xpansive
 2011-02-12 12:29:22 +11:00
James Logsdon
09c6389b3f Adding PLAYER_PICKUP_ITEM event hook 2011-02-12 01:39:00 +01:00
James Logsdon
82931a601d Adding PLAYER_DROP_ITEM event hook 2011-02-12 01:09:42 +01:00
cvpcs
71f97ffc5b Send a BlockRedstoneEvent if powered redstone is destroyed 
When a powered redstone block is destroyed, a BlockRedstoneEvent should
be sent to notify plugins that particular block is returning to current
0 before the BlockDamageEvent is sent.  This allows plugins dealing with
redstone to not have to listen for redstone destruction, but just listen
to changes in current.
 2011-02-12 00:32:39 +01:00
Dinnerbone
4b6c633659 Removed debug and fixed //craftbukkit comments from 0239b76f611597f8486a 2011-02-11 09:27:57 +00:00
Tahg
c0b940d619 more chunk fixes 2011-02-11 02:01:32 -05:00
Tahg
41e136b880 fix in LongHashset.java 2011-02-10 14:59:41 -05:00
Tahg
89232b826b fixes for chunks 2011-02-10 14:33:41 -05:00
Tahg
524f966ef3 Merge branch 'master' of https://github.com/Bukkit/CraftBukkit 2011-02-10 09:24:14 -05:00
Dinnerbone
1d49e5a4b1 Fixed chunk unloading 2011-02-10 13:27:53 +00:00
Dinnerbone
a52f5ef520 Threadsafe World.c(int i, int j) 2011-02-10 11:56:30 +00:00
Zenexer
96794e15db Added spawn-protection property to server.properties 2011-02-10 12:16:31 +08:00
Zenexer
1da852265a Added spawn-protection property to server.properties 2011-02-10 12:16:30 +08:00
Zenexer
fbe54b05f4 Added spawn-protection property to server.properties 2011-02-10 12:16:30 +08:00
Dinnerbone
814c9d444f Fixed LongHashtable.values() 2011-02-09 20:55:04 +00:00
Dinnerbone
18efbd82b6 Worlds are now in the order they are loaded, with [0] being default 2011-02-09 20:25:14 +00:00
Dinnerbone
6e58053eb7 Probably fixed getLoadedChunks() 2011-02-09 20:00:17 +00:00
Dinnerbone
7401ee54a3 Added Creature.getTarget 2011-02-09 13:44:46 +00:00
James Logsdon
e3011157b1 Added Creature.setTarget per jlogsdon 2011-02-09 13:27:28 +00:00
Dinnerbone
7988345368 Added call to new event on world save (at stop and force save). (Per EyvindRM) 2011-02-09 12:59:00 +00:00
Ben64
0592b334f6 Terrain generation bugfix (will also be in Mojang 1.3) 2011-02-09 10:01:41 +01:00
Tahg
03be05790e added method to force an inventory update 2011-02-08 21:52:06 -05:00
Tahg
43ef3b3037 fixed explosions 2011-02-08 20:28:10 -05:00
Tahg
61b79e8f98 inventory fixes 2011-02-08 19:47:08 -05:00
Tahg
b9a37399ae changed fence behaviour 2011-02-08 17:10:48 -05:00
Alexander Hesse
6ad4ca2a42 Implemented Sneak event 2011-02-08 17:12:51 +01:00
Dinnerbone
1a983aceb3 Just cleaning some commits. Don't mind me. 2011-02-08 15:22:46 +00:00
Dinnerbone
3526a66fbe Added loadChunk, unloadChunk and unloadChunkRequest. 2011-02-08 14:26:55 +00:00
Dinnerbone
6b9b59db4e Added getContents() to TileEntityDispenser to be compatible with 
InventoryChanged TileEntityDispenser to be built against latest mc-dev
Merge branch 'merge-fork' of https://github.com/Hidendra/CraftBukkit
 2011-02-08 14:22:52 +00:00
culturespy
a9a0ad6278 Adding Craftbukkit comment-tags. 2011-02-08 14:11:34 +00:00
culturespy
f20af7b129 Make Explosion remember whether it was canceled so that WorldServer can avoid sending unneeded explode packets. 2011-02-08 14:11:34 +00:00
Dinnerbone
499d44763d Finalizing the breakage! 2011-02-08 12:54:28 +00:00
Dinnerbone
7d1849567a Implemented WORLD_LOADED 2011-02-08 12:50:36 +00:00
Dinnerbone
bcf9b5ca19 Oops! This matters. 2011-02-08 12:48:29 +00:00
Dinnerbone
6751433a8e Implemented new Server methods (getWorld + changes to createWorld) 2011-02-08 12:03:36 +00:00
Erik Broes
50e42496e3 @Override interface implementation is 1.6 exclusively 2011-02-07 11:03:56 +01:00
Erik Broes
7b840489a3 Oopsie on compile issue 2011-02-07 10:43:50 +01:00
Erik Broes
2497a61044 Moved changes we did to WorldServer back down to World. 2011-02-07 10:26:12 +01:00
Erik Broes
421d1c1c1f Fixing missing mandatory comments. 2011-02-07 09:49:42 +01:00
Tahg
8acebcd7d6 Fixed Chunk cache in world 2011-02-07 03:34:32 -05:00
Tahg
3629580868 Chunk fetching improvements 2011-02-07 01:33:57 -05: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
7a71347cdf Fixed logging into the correct world 2011-02-07 01:51:06 +00:00
Dinnerbone
3f8d9c0e1f Fixed inventory transition 2011-02-07 01:51:06 +00:00
Dinnerbone
e9b1607fdc Fixed entity updating 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
Forsaken
002b5ebefc Added PlayerKick (setReason, setLeaveMessage, setCancelled) and PlayerRespawn (setLocation) 2011-02-06 12:38:38 +01:00
Erik Broes
228b5e7ccd Added VEHICLE_COLLISION_ENTITY which vanished after porting the code 2011-02-06 11:51:35 +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
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
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
durron597
fc58672e6a Changed BlockCanBuildEvent to store the int and not the material 2011-01-01 03:21:49 -05:00
durron597
3094b40b89 Changed BlockCanBuild event to pass the material 2011-01-01 03:12:39 -05:00
Dinnerbone
49b225ac08 Fixed Material 2011-01-01 07:05:05 +00:00
durron597
c7d680163f Didn't work correctly before. Now it does 2011-01-01 01:39:28 -05:00
durron597
2efc265b96 Implemented BLOCK_CANBUILD 2011-01-01 01:20:44 -05:00
durron597
02c469a93d Changed Block to CraftBlock. Changed callHook to getServer 2010-12-31 22:59:30 -05:00
durron597
4af385af1f Reimplemented BlockFlow to use multiple BlockFromToEvents 2010-12-31 21:17:16 -05:00
Dinnerbone
d72ecbaf3f Merge branch 'master' of github.com:Dinnerbone/Craftbukkit 
Conflicts:
	src/net/minecraft/server/WorldServer.java
 2010-12-31 21:58:18 +00:00
Dinnerbone
1795a66df3 Fixed physics event 2010-12-31 21:46:19 +00:00
durron597
ea0b616492 Implemented BLOCK_FLOW 2010-12-31 07:53:56 -05:00
durron597
4d05943bab Added callHook method to WorldServer so we can get callEvents from 
any world instance
 2010-12-31 07:52:40 -05:00
Dinnerbone
a69c75bede Implemented BLOCK_PHYSICS 2010-12-30 22:07:54 +00:00
Dinnerbone
a9191c24b3 Fixed insane fall damage (entities reset on death) 2010-12-30 20:34:26 +00:00
Dinnerbone
a063036210 Fixed player handle being reset on death or disconnection 2010-12-30 05:35:30 +00:00
Dinnerbone
bd53a823d2 Implemented Player.sendMessage() 2010-12-30 04:56:34 +00:00
Dinnerbone
f8e01e128b Don't override getName in CraftPlayer 2010-12-30 04:39:28 +00:00
Dinnerbone
416964ef5a No lookup for worlds, store on object 2010-12-30 04:37:32 +00:00
Dinnerbone
c57530392c Implemented entities 2010-12-30 04:30:12 +00:00
Dinnerbone
193bf01367 Moved the PLAYER_MOVE and PLAYER_TELEPORT hooks to be packet-based, fixed player.getLocation() to return pitch/yaw 2010-12-29 01:25:32 +00:00
Dinnerbone
6d28eb0111 Made Block.setType/Block.setData functional 2010-12-29 01:07:57 +00:00
Dinnerbone
36b95edc0c Merge branch 'master' of github.com:Dinnerbone/Craftbukkit 2010-12-29 00:29:31 +00:00
Dinnerbone
e85cabeb4f Add some .toString()s 2010-12-29 00:29:18 +00:00
VictorD
5faa476554 Updated PLAYER_MOVE hook to deal correctly with a cancelled event. 2010-12-29 01:19:19 +01:00
Dinnerbone
b3c6a7953d Merge branch 'master' of github.com:Dinnerbone/Craftbukkit 2010-12-28 23:52:43 +00:00
Dinnerbone
804b5e7d2b Keep Blocks updated when changed by the world 2010-12-28 23:52:29 +00:00
VictorD
5402eb5c86 Added support for event PLAYER_MOVE 2010-12-29 00:42:19 +01:00
Dinnerbone
ef622b20d1 Implemented PLAYER_LOGIN 2010-12-28 22:22:26 +00:00
Dinnerbone
f9eb5a92a1 Implemented PLAYER_CHAT and PLAYER_COMMAND 2010-12-28 21:52:39 +00:00
Erik Broes
c49239fa8c Moved from jd-gui to jad 2010-12-28 20:52:24 +01:00
Dinnerbone
656f8a8e40 Changed event calling to reflect new event structure 2010-12-28 15:41:36 +00:00
Dinnerbone
b04fa07b45 Added chunk/block/location/world 2010-12-27 02:13:03 +00:00
Dinnerbone
b5aa876278 Changed quit to use PlayerEvent 2010-12-27 02:12:38 +00:00
Dinnerbone
01a0562cab Call hooks, update to new code 2010-12-26 02:20:29 +00:00
Dinnerbone
2798e5b84f PluginManager => SimplePluginManager 2010-12-25 15:42:17 +00:00
Dinnerbone
cc734a3aa6 No longer hardcoding sample plugin, now uses plugins dir 2010-12-24 19:04:35 +00:00
Dinnerbone
c8b9f833d9 Fixed a few bugs getting sample plugin to load 2010-12-24 18:16:10 +00:00
Dinnerbone
8274655360 Load sample plugin for now 2010-12-24 17:24:21 +00:00
Dinnerbone
a799b1463b Hook onto the server, and added player 2010-12-22 15:22:23 +00:00
Dinnerbone
84f7c6c8d2 Initial structure 2010-12-21 16:52:15 +00:00