SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität
1.582 Commits 4 Branches 1 Tag 299 MiB
5a6878b9b1
Commit graph

1018 Commits

Autor SHA1 Nachricht Datum
Feildmaster
fa6fd24f2a [Bleeding] Handle EntityHuman attack a bit more properly. 2012-02-09 20:17:03 -05:00
Feildmaster
8ecfca47de [Bleeding] Fixed EnderDragon suffocation. 2012-02-09 20:12:38 -05:00
Aidan Matzko
6dda89d873 [Bleeding] Deprecate Enderman events in favor of EntityChangeBlock 2012-02-09 11:36:04 -05:00
Tahg
10ab7b96ed Made steps fire a BlockPlace event. Fixes BUKKIT-394 2012-02-09 11:25:53 -05:00
EvilSeph
6abd178ea7 Added ItemStep for diff visibility. 2012-02-09 11:21:35 -05:00
craftycreeper
ad6bab8c6f Implemented EntityTeleportEvent. Fixes BUKKIT-366 2012-02-09 03:46:42 -05:00
EvilSeph
be0ecf4670 Pass EntityEnderCrystal to EntityExplode event. 2012-02-08 21:54:22 -05:00
EvilSeph
39002fd39f Added EntityEnderCrystal for diff visibility. 2012-02-08 20:01:46 -05:00
EvilSeph
ae333ded91 Made flaming arrows respect PVP settings. Fixes BUKKIT-541 2012-02-08 19:06:09 -05:00
EvilSeph
879a87b1e0 Fixed Pumpkins being reported as AIR in BlockPlace event when building snowmen. Fixes BUKKIT-697 2012-02-08 18:30:59 -05:00
EvilSeph
6d67456970 Made BlockPumpkin report an appropriate SpawnReason.BUILD_SNOWMAN when a snowman is spawned. 2012-02-08 18:28:41 -05:00
EvilSeph
8e7e073523 Made Ender Dragons fire EntityRegainHealth events when getting healed by Ender Crystals. 2012-02-08 10:55:15 -05:00
EvilSeph
0a52fd372a Fixed VehicleBlockCollisionEvent returning the wrong block. Fixes BUKKIT-396 2012-02-08 06:18:04 -05:00
EvilSeph
497a0e247b Made crafted maps fire MapInitializeEvent. Fixes BUKKIT-143 2012-02-08 05:45:55 -05:00
EvilSeph
274e8a141a Made flaming arrows fire EntityCombustByEntity events. Fixes BUKKIT-707 2012-02-08 03:27:34 -05:00
EvilSeph
4d563342ba Added Spawner Egg support to CreatureSpawnEvent. 2012-02-05 02:11:21 -05:00
Travis Watkins
5ae8f13fde Fixed items losing their enchantments under certain circumstances. 2012-02-03 03:39:35 -05:00
Travis Watkins
329cf29667 Added BlockFurnace for diff visibility. 2012-02-03 03:38:23 -05:00
Travis Watkins
37c8868532 [Bleeding] Implemented Vanish API. 
Remove players that cannot see a player from their EntityTrackerEntry and only
send user list updates to players who can see the player they reference.
 2012-02-03 03:34:03 -05:00
Tahg
5479a2ca82 Fixed being unable to cancel TNT placement. Fixes BUKKIT-89. 2012-02-03 01:39:00 -05:00
Tahg
1884f2f763 Added BlockTNT for diff visibility. 2012-02-03 01:32:29 -05:00
Tahg
14bb771957 Allow plugins to change ID and Data during BlockPlace event. 
Fixes BUKKIT-674
 2012-02-03 01:14:47 -05:00
Tahg
1bb011a543 Fixed other types of 'block transmuters'. 2012-02-03 00:51:59 -05:00
Tahg
8bf770c5f9 Added debug to help with diagnosing tile entity issues in the future. 2012-02-03 00:50:35 -05:00
Tahg
2dba592dc4 Remove tile entities when a block is removed. 2012-02-03 00:45:58 -05:00
EvilSeph
8b5289d431 Fixed wrong game type being sent when a player is teleported across worlds. Fixes BUKKIT-510 2012-02-01 01:30:53 -05:00
Tahg
69e766c5f3 Fixed BlockPlace event. Fixes BUKKIT-663 2012-01-30 02:57:58 -05:00
Nathan Adams
875219e28c Fixed vanilla issue where chunks would be mislocated and corrupt. Big thanks to Wug for the fix. 2012-01-30 04:27:25 +00:00
Nathan Adams
72559fe634 Added ChunkLoader.java and ChunkRegionLoader.java for diff visibility 2012-01-30 04:20:59 +00:00
Eric Stokes
3a419481ea Added 'generate-structure' setting support and WorldCreator property. 
Fixes BUKKIT-655 and BUKKIT-592
 2012-01-29 13:07:44 -05:00
EvilSeph
f1a35effb0 Added useExactLoginLocation(). Closes BUKKIT-145 
useExactLoginLocation() looks for settings.use-exact-login-location within bukkit.yml.

If true, we will bypass Vanilla's behaviour of checking for collisions and moving the player if needed when they login.

If false, we will continue to follow Vanilla's behaviour and move players that 'collide' with objects when they login.
 2012-01-29 12:33:05 -05:00
Erik Broes
c5a4bfd291 Use OO > new method 2012-01-29 16:06:11 +01:00
EvilSeph
1ea0037f49 Fixed maps crashing/disconnecting the client under certain circumstances. 2012-01-29 01:15:55 -05:00
Tahg
9b635aacc4 Moved BlockPlace event. 2012-01-28 03:09:48 -05:00
EvilSeph
7bdfea4820 Reverted onPlace changes. 2012-01-28 03:09:48 -05:00
Erik Broes
9d90839723 Put statement inside CraftBukkit block 2012-01-28 09:04:16 +01:00
EvilSeph
bb730f0ee7 Cleanup. 2012-01-27 18:23:58 -05:00
Erik Broes
38ad0ea5fd Prevent (Entity) null to be added to the entity list. 2012-01-27 19:42:14 +01:00
Erik Broes
16d3b705c5 Fix 'Block Transmute'. Bug where you could change the data of a block 'on demand'. 2012-01-27 19:29:33 +01:00
EvilSeph
98fd1a3606 Let's be a little less tricky to the client. Relates to BUKKIT-637 2012-01-26 20:35:20 -05:00
EvilSeph
5900268e7a Fixed the behaviour of fluid blocks. Fixes BUKKIT-629 2012-01-26 20:04:31 -05:00
EvilSeph
5bcb23502e Trick the client instead of modifying the world. Fixes BUKKIT-637 2012-01-26 19:36:27 -05:00
EvilSeph
b987d1b052 Really loosened the throttles strictness this time. 2012-01-24 23:43:23 -05:00
EvilSeph
3e0a26f270 Fixed redstone torches not updating indirect neighbors. Fixes BUKKIT-477 2012-01-24 23:38:15 -05:00
Tahg
989acd0afb Fix invalid data in pistons 2012-01-24 21:42:45 -05:00
EvilSeph
b416dd337f Loosen throttle strictness. 2012-01-24 18:45:30 -05:00
Tahg
39935eb3f2 Fix diodes not updating indirect neighbors. 2012-01-24 18:03:34 -05:00
Erik Broes
3b46222c54 Persist locking of an animal's age to disk 2012-01-24 22:06:37 +01:00
Mike Primm
94231f1ecf [Bleeding] Implemented EnchantmentTable API. 2012-01-24 06:15:34 -05:00
Tahg
c7716e1de4 [Bleeding] Audit of onPlace methods, Moved to postPlace as appropriate. 
Closes BUKKIT-89
 2012-01-24 05:18:23 -05:00
Sam Wilson
e92bdab57a Fixed CraftLivingEntity.damage when the entity is an EntityComplex. 
Fixes BUKKIT-589: if you call damage on an instance of EnderDragon, no damage
is done.

Reason for bug: damage calls Entity.damageEntity.  But EntityComplex
overrides damageEntity to do nothing.

Fix: CraftComplexLiving should call EntityComplex.e instead of
Entity.damageEntity.  e is the method that actually does damage to an
instance of EntityComplex.
 2012-01-24 04:10:47 -05:00
Zeerix
872dad5540 [Bleeding] Implemented PotionSplashEvent. Closes BUKKIT-307 2012-01-24 02:12:41 -05:00
Travis Watkins
74ead3abd1 Immediately tell client a block is broken, then process the event. 
In order to avoid clients seeing blocks break, reappear, then break again due
to lag caused by plugins taking too long to process the BlockBreakEvent we
immediately tell the client the block is air then process the event. If the
event ends up being cancelled the client will get another packet telling them
the block still exists.
 2012-01-23 23:59:36 -05:00
Travis Watkins
cf521b5a5c Only truncate player name when sending spawn packet. 2012-01-23 23:32:21 -05:00
EvilSeph
97ce5c4479 Implemented PlayerShearEntityEvent in EntityMushroomCow. 
Due to the Vanilla client overzealously predicting things, shearing produces
client-side artifacts. See BUKKIT-611 for more information.
 2012-01-23 22:41:34 -05:00
Aidan Matzko
93bc8ecd93 [Bleeding] Implemented Sheep, Shear and EntityChangeBlock API. Thanks 
tips48! Closes BUKKIT-512
 2012-01-23 18:58:37 -05:00
Mike Primm
229337bc8f Use BlockFadeEvents to signal fire blocks burning out 2012-01-22 18:20:01 +01:00
EvilSeph
51b29eff06 Removed accidentally committed change. Needs more investigating 2012-01-21 18:52:32 -05:00
EvilSeph
1bbeec1f75 Accounted for NMS getItem() returning null in recent commit. 2012-01-20 11:46:24 -05:00
Nathan Adams
85ab95cec7 Nullcheck EntityItem's ItemStack where required. This fixes BUKKIT-552 2012-01-20 16:40:27 +00:00
Nathan Adams
51a056ecd5 Disallow colour names in offline-mode. This fixes BUKKIT-439. Thanks to cainfool for the discovery. 2012-01-20 16:03:15 +00:00
Nathan Adams
b0f29b1755 Throw PlayerLevelChangeEvent and PlayerExpChangeEvent events. Thanks to feildmaster for the PR. 2012-01-19 16:07:18 +00:00
Erik Broes
737cf284e3 Fix giving wrong arguments to callEntityDamageEvent. Forgot to update after changing the signature :( 2012-01-18 08:16:38 +01:00
Zeerix
bcf6440bc4 [Bleeding] Implement EntityShootBowEvent. Thanks Zeerix. 2012-01-17 19:51:06 +01:00
Erik Broes
edbb7358fc [Bleeding] Implementation of the brewing stand. 2012-01-17 19:50:29 +01:00
Tahg
387d7319bc [Bleeding] Prevent BlockSnow from recursively calling a physics update. 2012-01-17 19:50:10 +01:00
Zeerix
1d04305cea [Bleeding] Added event calls for healing and harming by potions 2012-01-17 19:49:11 +01:00
Zeerix
2cc70bb055 [Bleeding] Implemented Block.breakNaturally and Block.getDrops 2012-01-17 19:48:44 +01:00
Erik Broes
29096577b6 [Bleeding] Implement animal breeding API changes. 2012-01-17 19:44:11 +01:00
Nathan Adams
520cb5aa5b Fixed bug involving pistons and powered rails. This fixes BUKKIT-517. 2012-01-15 20:50:00 +00:00
Nathan Adams
864397d6c8 Added MinecartTrackLogic.java and BlockMinecartTrack.java for diff visibility 2012-01-15 19:05:36 +00:00
Nathan Adams
65f30fd99d Dragons now throw events when creating portals 2012-01-15 12:01:11 +00:00
Erik Broes
233de0de2c Some efficiency updates to hit-mechanics. Thanks mintplant for the PR. 2012-01-15 12:54:58 +01:00
Erik Broes
d7cec38c38 Adding the option to suppress overload warnings as a bukkit.yml option. Thanks oloflarsson for the PR. 2012-01-15 11:11:41 +01:00
Nathan Adams
25050e38eb Disallow people spawning invalid entities using monster eggs. Thanks to md-5 for the PR. 2012-01-15 10:01:49 +00:00
Nathan Adams
390a79e098 Added ItemMonsterEgg.java for diff visibility 2012-01-15 10:01:42 +00:00
Erik Broes
a4ce846d07 Fix formatting. 2012-01-15 10:54:57 +01:00
Erik Broes
61ec751ca1 Update for 1.1_01 renames. 
We know these updates (can) break plugins bypassing Bukkit. They are needed for
smooth updates however. There will be another one right before before 1.1-R1.
 2012-01-15 10:52:37 +01:00
Nathan Adams
6495eee0c9 Throw an EntityBlockFormEvent for snowmen. Thanks to feildmaster. 2012-01-15 09:13:30 +00:00
Nathan Adams
93b3c96126 Don't allow explosions at the top of the world to wrap around. This fixes BUKKIT-232, thanks to wilsonsd for the PR. 2012-01-15 07:29:48 +00:00
Nathan Adams
23adb0d02f Minor optimization in BlockGrass by only checking light once instead of twice. Thanks to oloflarsson for the PR. 2012-01-15 05:58:56 +00:00
Nathan Adams
b369805590 Don't allow players with modded clients to send empty (0 char) chat messages. Thanks to a PR by robin0van0der0v 2012-01-15 05:52:46 +00:00
Nathan Adams
dfbcd36ab7 Fixed a further exploit with players attacking more things that they shouldn't. 2012-01-14 18:12:59 +00:00
Nathan Adams
2ab160e484 Implemented new PlayerDeathEvent methods for exp setting 2012-01-14 18:08:27 +00:00
Nathan Adams
743c623d53 Modified ConsoleReader to use System.in instead of FileDescriptor.in. Big thanks to escortkeel for the (unfortunately very old) PR. 2012-01-14 17:12:45 +00:00
Feildmaster
6cc56b8c2c Added ItemDespawnEvent 2012-01-14 17:03:38 +00:00
Mike Primm
cc05bea457 Prevent unbounded TickList growth on busy servers (>1000 events/tick). This completes another Bleeding request. 2012-01-14 16:47:57 +00:00
Nathan Adams
3d31c27864 Fixed players attempting to attack item entities - This fixes BUKKIT-341 2012-01-14 13:27:15 +00:00
Nathan Adams
9da730c8e1 Made Mycel blocks throw BlockFade and BlockSpread events. This fixes BUKKIT-488. Thanks to tips48 for the pull request. 2012-01-14 12:56:54 +00:00
Nathan Adams
64ac337d4c Added BlockMycel.java for diff visibility 2012-01-14 12:54:20 +00:00
Nathan Adams
84b0310ae8 Fixed items retaining enchantment visual effects after all enchantments are lost 
Issue #BUKKIT-24 - Upon removing enchantments, visual effect on item does not go away
 2012-01-14 12:29:11 +00:00
Nathan Adams
0a2a38c25b Added NBTTagCompound.java for diff visiblity 2012-01-14 12:27:38 +00:00
Nathan Adams
9ac06e7720 Fixed informing players of supported Plugin Channels 2012-01-14 01:46:22 +00:00
Tahg
24fe96ada8 Add fix for new login protocol 2012-01-13 10:20:30 -05:00
Nathan Adams
b4f215e913 Implemented new Plugin Message API - see http://dinnerbone.com/blog/2012/01/13/minecraft-plugin-channels-messaging/ 2012-01-13 08:53:39 +00:00
Nathan Adams
8aaa528763 Fixed version in startup message 2012-01-12 22:33:31 +00:00
Erik Broes
7219d4dd85 Updated to Minecraft 1.1 2012-01-12 23:10:13 +01:00
Erik Broes
7d0e739f96 Fix balance of CraftBukkit start/end. 2012-01-12 19:43:34 +01:00
Nathan Adams
897551e39e Update to mc-dev rename revision 01 2012-01-12 15:27:39 +00:00
Erik Broes
7f079a0cd6 Fix CraftBukkit comments. 2012-01-12 12:07:38 +01:00
EvilSeph
42e473783e Fixed our handling of network packets. 2012-01-10 23:21:38 -05:00
EvilSeph
194f54a90e Revert "Improved our handling of player interactions." 
This reverts commit b4d325e0efe44bc74e69371fb11e7c3e1124b2a3.
 2012-01-10 22:19:23 -05:00
EvilSeph
bff4d0f696 Improved our handling of player interactions. 2012-01-10 01:17:19 -05:00
Andrew Ardill
67dbe71bd9 Fix calling CombustEvent caused by enchantment 
The CombustEvent created when an Entity attacks with a fire enchanted weapon
was never raised through the plugin manager. Thanks for pointing it out
EdGruberman!
 2012-01-09 10:46:07 +11:00
EvilSeph
93aed40c4f Fixed filled bottles not appearing in inventory. Fixes BUKKIT-325. Thanks 
md-5!
 2012-01-07 22:06:41 -05:00
EvilSeph
13470ccf79 Inform the client when break events are cancelled. Thanks mrapple! 2012-01-07 20:26:23 -05:00
EvilSeph
86fef037e0 Fixed NPE in World. Fixes BUKKIT-306. Thanks Evenprime! 2012-01-07 19:12:38 -05:00
Tahg
b74a69041e Fix door physics and revert to pre 1.0 behavior 2012-01-07 18:38:05 -05:00
Erik Broes
bcdad9f837 Fix snowball not recognizing int damage values properly from Craftbukkit -- Thanks Sleaker 2011-12-29 20:15:06 +01:00
EvilSeph
8b735bf47a Made startup completion time actually be reported in seconds. Again. 2011-12-27 20:10:49 -05:00
EvilSeph
8b21a0eeef Disconnected means disconnected. 2011-12-27 19:57:54 -05:00
sunkid
066a95769c fixed double firing of EntityDamageByEntityEvent 2011-12-27 20:21:28 +01:00
sunkid
5adcf526ab moved firing of ProjectileHitEvent for mojang projectiles 2011-12-27 19:33:28 +01:00
Tahg
81c751a8a3 Fix for water and lava removal in creative mode BUKKIT-362 2011-12-20 21:20:43 -05:00
Tahg
474b7838a6 Fix for big trees not growing BUKKIT-304 and BUKKIT-365 (thanks M D) 2011-12-20 18:02:39 -05:00
Tahg
299a0d0919 Fixed signs being editable after placement. Fix for BUKKIT-364 2011-12-20 18:02:39 -05:00
Nathan Adams
972b2087f2 Fixed bonemeal not being consumed on failed growth attempts. This fixes BUKKIT-337. Thanks to md-5 for the pull request! 2011-12-19 16:41:55 +00:00
Nathan Adams
bea7b1373e Fixed vanilla->bukkit world migration for The End. This fixes BUKKIT-326. Thanks to chewi for the pull request! 2011-12-19 16:26:11 +00:00
Andrew Ardill
b0ab686964 Avoid some avoidable calls, clean PluginManager accessors 2011-12-19 18:32:35 +11:00
Sam Wilson
a7744ac751 Prevent VehicleEnterEvent being sent when player exits vehicle. 
Fix for BUKKIT-223.

Issue BUKKIT-223: When a player exits a minecart or boat, both a
VehicleExitEvent and a VehicleEnterEvent are fired.  Only the
VehicleExitEvent should fire.

Reason for bug: This occurs because the VehicleEnterEvent is fired in
EntityBoat.b and EntityMinecart.b *any* time a player right-clicks on
a vehicle, whether the right-click is to enter the vehicle or exit it.

Fix: By moving the creation of VehicleEnterEvents from EntityBoat.b
and EntityMinecart.b to Entity.setPassengerOf, we can create either a
VehicleEnterEvent or a VehicleExitEvent, depending on whether the
player is entering or exiting a vehicle.
 2011-12-19 18:22:38 +11:00
Nathan Adams
e1586e017a ... Fixed dispensers again! 2011-12-12 21:49:35 +00:00
Nathan Adams
5412d6f5a8 Fixed crash with dispensers dispensing dispensables 2011-12-12 21:23:46 +00:00
EvilSeph
bd181fa04e The dead are not meant to walk. Fixes BUKKIT-95. Thanks Evenprime! 2011-12-12 12:50:10 -05:00
Nathan Adams
b653ce3c1c Implemented (offline)player date methods 2011-12-12 17:39:52 +00:00
Andrew Ardill
82965eb10f Stop converting ItemStack to nms ItemStack by hand 
This should fix many issues with enchantments being lost, as the method used takes care of enchantments.
Additionally, use the new nms ItemStack constructor in places where appropriate.

Fixes (at least part of) BUKKIT-7. Need to identify any further places to fix.
 2011-12-13 01:46:55 +11:00
Andrew Ardill
d34e289434 Teach nms ItemStack constructor how to take enchantments 2011-12-13 01:45:58 +11:00
EvilSeph
14754c71a2 Added missing CraftBukkit comments in previous commit. 2011-12-12 03:16:50 -05:00
EvilSeph
322330e942 Fixed players not receiving movement packets after trying to leave The End. Fixes BUKKIT-289. 2011-12-12 02:55:20 -05:00
Nathan Adams
b2af70e5c7 Implemented getKiller in LivingEntity 2011-12-11 16:05:27 +00:00
Nathan Adams
1fc8092ea6 Fixed corrupt mob spawners crashing on load - this fixes BUKKIT-69, BUKKIT-144 2011-12-11 15:59:55 +00:00
EvilSeph
88d1512507 Fixed issues with Ender Pearls. This fixes BUKKIT-248 and BUKKIT-264. 2011-12-11 02:13:48 -05:00
Tahg
77c07095bd removed changes to MobSpawner behavior 2011-12-10 17:07:32 -05:00
EvilSeph
de1a32bb16 Fixed spiders not respecting the EntityDeathEvent. This fixes BUKKIT-275. 2011-12-10 15:59:07 -05:00
EvilSeph
ec59dd9173 Fixed issues in our handling of The End as per BUKKIT-11. 
This also addresses BUKKIT-27.
 2011-12-10 15:15:27 -05:00
EvilSeph
84a19565d4 Fixed (Bukkit multiworld) maps as described in BUKKIT-142. 2011-12-10 15:15:26 -05:00
Erik Broes
f7649724fe Implemented CraftServer.getAllowEnd(). Thanks codename-B! 2011-12-09 18:55:36 +01:00
Nathan Adams
d36ac82c83 Fixed NPE in ServerConfigurationManager when sometimes attempting to flee the End 2011-12-09 17:09:21 +00:00
Nathan Adams
5e43c61fad Implemented onStructureGrow event, thanks to md-5. 2011-12-09 16:11:56 +00:00
Nathan Adams
076460b419 Added ItemDye and WorldGenHugeMushroom for diff visibility 2011-12-09 16:01:37 +00:00
Andrew Ardill
d75d1660b3 Make EntityEnderDragon call the ExplosionEventi 
Rather than just creating the event and not worrying any further about it.
Thanks for the heads up snowleo!
 2011-12-08 10:30:20 +11:00
Andrew Ardill
b08b85bd26 Teach EnderDragon how to throw EntityExplosionEvents when it breaks blocks 
We also teach CraftWorld how to explode an event, taken from
Explosion.a(boolean) (the code that breaks blocks and drops them on the ground).

The EnderDragon has a flag that slows it down when it hits unbreakable blocks:
Obsidian, White Stone or Bedrock. It might be useful to extend the event so that
plugins can set this.

Letting the API set the default yield for an explosion event has been
deprecated, so we now set the default yield using the appropriate constructor.
 2011-12-08 00:31:21 +11:00
Andrew Ardill
93a4a9ba8c Teach MinecraftServer how to handle Remote Console commands. 
This fixes BUKKIT-220. Thanks for the help bawoodruff!
 2011-12-07 17:45:50 +11:00
Tahg
e4a839cbbc Fix for entity spawning and some code cleanup 2011-12-06 19:21:10 -05:00
Tahg
bc8f02788f Performance update to remove several very high counts of temp object creation 2011-12-06 08:52:45 -05:00
Tahg
57112887ca Another fix for enchantments when moving around inventory. (Still glitches visually at times) 2011-12-05 04:02:59 -05:00
Andrew Ardill
bf60f44013 Teach EnderDragon how to throw EntityDamage events 
Relates to BUKKIT-129
 2011-12-05 19:23:54 +11:00
Andrew Ardill
b1a3aa602a Clean-up some events to maintain general style 2011-12-05 19:23:40 +11:00
Nathan Adams
dbd3ff71fc Implemented server.getOfflinePlayers 2011-12-04 17:57:00 +00:00
Nathan Adams
1dbebb4593 Fixed exp resetting upon teleporting cross-world (fixes BUKKIT-46. Again.) 2011-12-04 12:16:15 +00:00
Nathan Adams
98e062f0cf Fixed a few player-respawn issues. This should resolve BUKKIT-28 (Dupe bug), BUKKIT-29 (Poisons lasting), and BUKKIT-46 (XP resetting) 2011-12-04 12:10:02 +00:00