Jeremy Wood
d05e2b500f
Synchronized world properties required by Async chat event.
2012-08-05 00:11:13 -04:00
Jeremy Wood
b2f3b74062
Synchronized all access to worlds map in WorldManager.
2012-08-05 00:00:46 -04:00
Jeremy Wood
16e42f6469
Finalized some object in MultiverseCore to help with thread-safe migration.
2012-08-04 23:51:43 -04:00
Jeremy Wood
a31dc83635
Synchronized getting/setting of mv config object.
2012-08-04 23:50:01 -04:00
Jeremy Wood
7b99130bfa
Synchronized config values to be used in new Async chat event.
2012-08-04 23:43:09 -04:00
Matt H
f57468126a
Added '/mv clone' command to clone a world.
2012-08-04 14:29:13 -06:00
Jeremy Wood
2b80ca80ae
Bumped protocol from 16 to 17.
2012-07-25 22:10:06 -04:00
Jeremy Wood
24e26bb7d7
Added buscript Javascript library.
2012-07-25 22:09:28 -04:00
Jeremy Wood
6133cf6bdf
Bumped protocol from 15 to 16
2012-07-19 21:10:51 -04:00
Jeremy Wood
085c7a1ccc
Migrated Multiverse-Adventure's copyFolder() into core.
2012-07-19 21:08:39 -04:00
main()
dd0b2137d6
Changes...
2012-07-12 17:34:25 +02:00
main()
8a4ba2a66c
Metrics!
2012-07-12 17:24:23 +02:00
Jeremy Wood
3e7841afc9
Don't bother checking economy stuff if it doesn't even cost to enter.
2012-07-03 16:25:56 -04:00
Jeremy Wood
a15317e21d
Removed many instances of String.format in favor of higher performance inline concatenation. We should prune many more of these as well.
2012-07-03 15:48:57 -04:00
main()
b10a37f232
Added compatibility check to MultiversePlugin
2012-06-26 20:11:24 +02:00
main()
144de09423
Added the abstract class MultiversePlugin.
2012-06-26 17:29:34 +02:00
main()
a60e4e06e1
DebugLog: No more duplicates and you can now modify the log-tag.
2012-06-26 17:26:10 +02:00
Jeremy Wood
9eccf93b66
Probably fixes #707 .
2012-06-20 10:18:52 -03:00
main()
220f6a31de
Should fix #738 .
2012-06-16 10:27:27 +02:00
main()
8cb4f22467
Improved EnglishChatColor and added the "style" world-property.
...
Closes #732 .
2012-06-13 15:58:17 +02:00
Jeremy Wood
a2a2594f5a
Properly closed debug.log for unit tests by calling onDisable().
2012-06-12 12:51:36 -04:00
Jeremy Wood
87df407743
You can once again set animals/monsters via /mvm set.
2012-06-07 17:08:47 -04:00
Jeremy Wood
cf007f091a
Stop creating a new map every time we want property aliases.
2012-06-07 15:44:32 -04:00
Jeremy Wood
680c35e0dc
Moved migration debug message to correct location.
2012-06-07 14:52:28 -04:00
Jeremy Wood
1a385c21d7
Removed leftover debug message.
2012-06-07 14:51:43 -04:00
Jeremy Wood
cced74d4b0
Suppress stacktraces thrown when migrating worlds.yml. Fixes #700 .
2012-06-07 14:50:37 -04:00
Jeremy Wood
1db555581b
DebugLog now extends Logger.
2012-06-07 13:26:22 -04:00
Jeremy Wood
63e0c028d9
Slightly improved debugging for worlds migration.
2012-06-07 12:55:32 -04:00
heisan213
d2c09b9d33
Prevent NPE when teleporting to a world not made by MV.
2012-05-22 19:25:32 +03:00
main()
21a3eeacc8
That's the way it should be.
2012-05-03 16:20:59 +02:00
main()
48768b5d6c
Now all properties are settable ingame. (bugfix)
2012-05-02 16:25:40 +02:00
main()
96294c092c
Wrong default value...
2012-05-01 19:10:51 +02:00
main()
9a3fde2f13
Saving keepSpawnInMemory to config file
2012-05-01 19:08:07 +02:00
main()
6520a31938
Fixed spawnlocation migration
2012-05-01 18:52:05 +02:00
main()
f1779c9e68
Shame on me. -.-
2012-05-01 18:46:47 +02:00
main()
9cc35d7b12
public
2012-05-01 18:08:51 +02:00
main()
02347e05d8
Fixed UOE when temporarily saving the NullLocation to the config
2012-05-01 17:43:05 +02:00
main()
a4196a901a
Fixed spawn location loading
2012-05-01 17:00:05 +02:00
main()
9b2dd0d6c9
Forgot some values, fixed allowweather migration
2012-05-01 16:49:40 +02:00
Jeremy Wood
0efb28be19
Properly close all input/output streams!
2012-05-01 10:47:20 -04:00
main()
5d9941d073
Why is 'null' deserialized to "null" instead of null!?
2012-05-01 15:31:10 +02:00
main()
82cfbaba4e
Fixed NPE in migrateWorldConfigs()
2012-05-01 12:48:45 +02:00
main()
9868c66cdb
Added migrators. Needs testing.
2012-05-01 12:42:48 +02:00
main()
d7a3e1839e
Should fix environment, seed and generator-issues.
2012-05-01 12:23:04 +02:00
main()
1496d940bf
Merge pull request #547 from Multiverse/mvworld-plus-serializationconfig-equals-awesome
...
MVWorld + SerializationConfig = Awesome
2012-04-30 13:54:37 -07:00
Jeremy Wood
da54f9769b
Stop giving up immediately on the first failed file deletion and continue deleting files recursively.
2012-04-06 14:54:48 -04:00
Jeremy Wood
2e4b814d6d
Added one extra tidbit of logging for GameMode enforcement.
2012-04-03 12:00:02 -04:00
Eric Stokes
3f93fb3648
Add new param to the PTPE, Don't die if we don't find or can't access bukkit.yml
2012-03-18 17:26:24 -06:00
main()
176e729a87
Ignoring TestWorldCreation.
...
TestInstanceCreator.tearDown() doesn't remove 'fish.world' correctly from the worlds.yml (fixed in mvworld-plus-serializationconfig-equals-awesome)
*cough* @FernFerret *cough*
2012-03-17 12:32:55 +01:00
main()
62f79e7592
Disabled Spout support because we aren't using it
2012-03-17 12:27:50 +01:00
main()
f60f770b98
Fixed #578
...
Another iPhone-commit...
2012-03-16 07:33:35 +01:00
Eric Stokes
c9b52c81a6
Add some neat debug to Permissions
2012-03-12 20:58:58 -06:00
Eric Stokes
5be6ea2766
Use the fromstring in entity type
2012-03-10 10:29:44 -07:00
main()
98f5e1e4ee
This IS fixed!
2012-03-10 17:41:53 +01:00
main()
de6fc6481e
Merge branch 'master' into mvworld-plus-serializationconfig-equals-awesome
...
Conflicts:
src/main/java/com/onarandombox/MultiverseCore/api/MultiverseWorld.java
2012-03-10 14:03:04 +01:00
main()
dcc6b828a8
Unused imports.
2012-03-10 13:59:04 +01:00
Eric Stokes
7da91f7875
Fix NPE with players and purging, Update AP and CH
2012-03-10 00:32:26 -07:00
Eric Stokes
d84f930a54
Fix purging removing the player entity
...
...and lots of other bad stuff...
2012-03-09 23:45:10 -07:00
main()
bdd5e8bd91
Now shortening the URL in /mvv using bit.ly!
2012-03-08 17:59:25 +01:00
main()
d1280a9031
Some fixes + added tests.
2012-03-07 19:59:20 +01:00
main()
08b8f01c44
Bugfix: We shouldn't check access-perms if enforceaccess is off!
2012-03-04 20:38:26 +01:00
main()
fd227960b9
Now correctly saving worlds
2012-03-04 20:21:42 +01:00
main()
0efc0b965b
Fixed removeWorldFromConfig(String).
2012-03-04 19:53:40 +01:00
main()
bbe134bd1a
Dots in world-names are now possible! :D
2012-03-04 19:36:14 +01:00
main()
91f7debb08
MVWorld + SerializationConfig = Awesome
...
Yes, I did it.
2012-03-04 16:08:09 +01:00
main()
871a601e37
General cleanup.
2012-03-03 17:07:07 +01:00
main()
bd7ad20b7b
Fixed the tests.
...
Why is this option even on by default...
2012-03-02 21:22:12 +01:00
main()
873d878252
Build fixed. Bukkit, I hate breaking changes!
...
However, this is not tested *at all*. Try it if you're brave enough ^^
2012-03-01 16:55:37 +01:00
main()
8c63cac4c5
I'm walking...
...
(Yes, I'm doing this on my iPhone)
Should fix #530 .
2012-03-01 13:12:09 +01:00
main()
109582335b
Missing javadoc.
2012-02-25 14:59:33 +01:00
main()
3f09fbd710
Fixed the world-purger using the names from the new EntiyType-enum.
...
Closes #478 .
Should fix #482 .
Poor sheep.
2012-02-25 14:48:36 +01:00
main()
ccb96ead10
Nasty bugs are nasty.
2012-02-25 13:11:21 +01:00
Eric Stokes
5c48899d92
Add initial support for enforcing access better
2012-02-23 20:15:10 -07:00
Eric Stokes
5f5d7084fa
Add **much** better mv check command
2012-02-22 20:22:37 -07:00
Eric Stokes
7b9c26d40a
Cleanup logging a bit, state when core is allowing players to access
2012-02-21 17:45:29 -07:00
Eric Stokes
0c96da48f9
Allow Spawner eggs to override settings
2012-02-21 16:58:36 -07:00
Eric Stokes
fbbe031b2c
Fix for method deprecations in R5
2012-02-21 05:25:59 -07:00
main()
868ac57a4a
Removed TODOs in deprecated classes. There's nothing left to be done there.
2012-02-06 19:25:34 +01:00
main()
7c21a114db
Fixed a bug in the info-command.
...
Information about the player's current world was shown when he entered an invalid world-name.
2012-02-06 17:19:51 +01:00
main()
e7573d3bd7
Rewrote the who-command. Fixes #467 .
2012-02-06 17:19:50 +01:00
main()
772d5a222d
Unused import...
2012-02-06 17:19:44 +01:00
Eric Stokes
2eb61af76f
Remove Structures and Types from import
...
Fixes #466
2012-02-05 20:32:09 -07:00
Eric Stokes
ad9d4e41ff
Remove EGG, that's for chickens, silly.
2012-02-05 00:10:36 -07:00
Eric Stokes
6a2e0e5810
Fix Portals being blocked in End
...
This Fixes #463
This is caused by a bug in Bukkit/Bukkit@b2364780cb see line 38 of EntityCreatePortalEvent
2012-02-04 23:46:40 -07:00
Eric Stokes
a9c6582487
Fix bypass perms. Fixes #443
...
I had a typo and didn't add the parent perms :(
Sorry about this big breakage... should be fixed.
2012-02-04 18:06:50 -07:00
Eric Stokes
b66028e0e0
Lots of cleanup prepping for 2.3AB
2012-02-04 17:40:12 -07:00
Eric Stokes
3ac4e55dc2
Minor bug fixed preparing for 2.3
...
Fix chatPrefix -> chatprefix
Fix portalcooldown -> teleportcooldown
Fix made teleportcooldown show up in the config
Add New warnings to the default.
2012-02-04 10:14:58 -07:00
Eric Stokes
950991ff1b
Removed old checks, cleanup poop
...
Add in the deprecated config method to not break other plugins
Fix handling of unloaded worlds in info and list
2012-02-04 09:10:56 -07:00
main()
a1b07065b2
Merge branch 'master' of github.com:Multiverse/Multiverse-Core into config-changes
...
Conflicts:
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java
src/main/java/com/onarandombox/MultiverseCore/commands/ConfigCommand.java
src/main/java/com/onarandombox/MultiverseCore/utils/MVPermissions.java
src/main/resources/defaults/config.yml
2012-02-04 15:19:37 +01:00
main()
a1075224d3
Fixed config...
2012-02-04 14:22:55 +01:00
Eric Stokes
d707a9f9a8
Made config command more hardcoded, but work.
2012-02-04 00:18:48 -07:00
Eric Stokes
90b04aa798
Add migrater for new configs, remove default, it's autogenned now
2012-02-03 23:36:17 -07:00
Eric Stokes
8272e121f4
Update to allpay 6
2012-02-01 19:13:47 -07:00
main()
44df567936
Now using SerializationConfig.
2012-02-01 16:28:23 +01:00
Eric Stokes
e8a72d19e1
Fix checkstyle violations
2012-01-29 15:56:57 -07:00
Eric Stokes
dde3b63fb9
Fix non-active properties not saving.
...
Fixes #409
2012-01-29 15:40:16 -07:00
Eric Stokes
87d4d4e1f4
Allow generate-structures to be used per world
2012-01-29 12:41:48 -07:00
Eric Stokes
7aca740296
Fix javadocs in PortalTypeConfigProperty
2012-01-29 12:37:40 -07:00
Eric Stokes
6c9bc6951f
Many small fixes.
...
- Update to 1.1-R2
- Fix the '--list' not working with the import
- Fix typo in new portalform catcher
- Fix 'the_end' not working on import/create
2012-01-29 12:11:41 -07:00
Eric Stokes
74726b44ab
Mid commit on adding portal prevention
2012-01-29 09:33:56 -07:00
Eric Stokes
18a57bf975
Allow eggs to spawn monsters
2012-01-28 08:27:57 -07:00
main()
b2578b1736
"No newline at end of file" deserves more than only an information.
2012-01-28 15:48:46 +01:00
main()
eec765bc48
Merge branch 'util-refactoring'
2012-01-28 15:41:58 +01:00
main()
060c0b1b44
(Re)designed PurgeWorlds/WorldPurger for extension.
2012-01-28 15:06:45 +01:00
Eric Stokes
ba90228586
Fix anchors pages not being accessable
...
Fixes #434
2012-01-27 22:24:50 -07:00
main()
8017172f0e
...
...
-.-
RAGE!
2012-01-26 19:00:31 +01:00
main()
b4ea5e9299
Change in SafeTTeleporter: We can SET the BlockSafety!
2012-01-26 18:56:54 +01:00
main()
59f2c8b62e
(Re)designed SafeTTeleporter for extension.
2012-01-26 18:55:09 +01:00
main()
9a28158e5f
Merge branch 'master' of github.com:Multiverse/Multiverse-Core into util-refactoring
2012-01-26 18:28:29 +01:00
Eric Stokes
4d97453881
Add the rest of the required items for the new events
2012-01-25 18:14:46 -07:00
Eric Stokes
8488f9db3c
Remove the MVVersionRequestEvent, Update pom
...
I've had enough of our repo being fussy. Just adding the bukkit repos too.
We'll get the proxy stuff working eventually...
2012-01-25 17:13:30 -07:00
main()
51586c7dd5
More tests :D
2012-01-25 21:03:09 +01:00
Eric Stokes
7b74384a8e
Fix compatibility with new tests.
...
Note: @main-- the new tests are balls slow for doing location generation. Like, they take 1s per check, which made the old one run for 16x16x9 seconds (making the test run take about 38.4 minutes)
For now, I've added a special case for nullterrains, which uses the new -n param to skip checking.
2012-01-24 20:32:39 -07:00
main()
33afa4d0d7
Now using the new listeners from ecb97fd5c1
2012-01-24 19:18:03 -07:00
main()
0980e0a201
Merge branch 'master' of github.com:Multiverse/Multiverse-Core into new-tests
...
Conflicts:
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
2012-01-23 19:05:21 +01:00
main()
c7d35f13f4
_Never_ System.out.println() exceptions!
2012-01-23 17:43:21 +01:00
main()
eebc5c6e62
Mocking is better than implementing mock-classes.
...
(déjà vu ... ;) )
2012-01-23 16:02:44 +01:00
Eric Stokes
ecb97fd5c1
Migrate to the new event system
2012-01-22 21:44:43 -07:00
Eric Stokes
bf76b77cf6
Add New api methods, Write location format better
...
Closes #411
2012-01-22 14:21:18 -07:00
Eric Stokes
21571bf54b
Made MockBlock compatible with latest 1.1 builds
2012-01-22 14:20:45 -07:00
Eric Stokes
7b8f73f0af
Bump Allpay version.
...
This adds EconXP support.
2012-01-16 19:45:29 -07:00
Eric Stokes
9313ff82ae
Bump protocol to 11, since we changed the api classes
2012-01-15 14:17:51 -07:00
Eric Stokes
c22acd6dd1
Fix arg range errors, add examples of WorldType.
2012-01-15 13:29:35 -07:00
Eric Stokes
0f3fd89228
Add new WorldTypes to Multiverse
...
This closed #394
2012-01-15 13:15:08 -07:00
Eric Stokes
7f93eedbac
Spout fixed mentioned issue!
...
Commit it was fixed in:
1157e6b642
Build it was fixed in:
http://ci.spout.org/job/SpoutPlugin/681/
2012-01-14 13:57:31 -07:00
Eric Stokes
04366dd50e
Fix Properties not loading properly
...
Closes #397
This also fixes Active Properties not saving properly
2012-01-13 17:49:22 -07:00
main()
dc0121509a
Fixed shouldWeKillThisCreature() in MVEntityListener.
2012-01-12 19:01:10 +01:00
main()
8bab4ae606
Merge branch 'master' of github.com:Multiverse/Multiverse-Core into new-tests
2012-01-11 16:44:59 +01:00
Eric Stokes
91c9e175d0
Add setActualDifficulty; Fixes #382
...
I also changed the difficulty properties to use setActualDifficulty.
2012-01-10 19:29:55 -07:00
main()
a1299239a2
Added more checks
2012-01-07 21:26:51 +01:00
main()
7cdb52e740
Yay for colored messages!
2012-01-07 21:26:23 +01:00
main()
e2d6652ef1
One single missing char that kept breaking everything.
...
It took me half an hour to find this -.-
RAGE!
2012-01-07 17:13:00 +01:00
main()
814725a2ba
Merge branch 'master' of github.com:Multiverse/Multiverse-Core into new-tests
...
Conflicts:
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
2012-01-07 16:10:18 +01:00
main()
da6e6145f2
(Re)designed MVMessaging for extension.
2012-01-07 16:05:16 +01:00
main()
ee715b13b0
(Re)designed LocationManipulation for extension.
2012-01-07 16:02:23 +01:00
Tim Ekl
b006a458db
Make syncMobs() public and Javadoc it
2012-01-06 20:53:38 -05:00
main()
a18611fb76
(Re)designed BlockSafety for extension.
2012-01-06 21:11:51 +01:00
main()
1af30dad1d
Added collection-support for sendMessages in MVMessaging.
2012-01-06 18:00:34 +01:00
Eric Stokes
79c06b5c42
Fix null worlds blowing up player money; Closes #373
2012-01-05 22:16:34 -07:00
main()
6861021c7a
C'mon, avoiding bad style can't be that hard!
2012-01-05 11:49:01 +01:00
Eric Stokes
5435fca6b3
Fix pvp and a few other active settings
2012-01-04 23:00:40 -07:00
Eric Stokes
53c801bb81
Move to ActiveConfig Properties.
...
This still needs some cleanup, but works well.
I'd like some users to test (and comment here) on the following
commands:
mvm set pvp true/false (can't test this by myself)
Everything else looks good. All tests pass. Think this one (due to the
active properties) fixes #322
2012-01-04 21:46:19 -07:00
main()
bb0b26e03c
Another huge commit. Style once again, hopefully for the last time.
...
And we're now using CheckStyle-suppression-comments, thanks @lithium3141.
2012-01-04 13:17:10 +01:00
Eric Stokes
10d849dc51
Add time, remove global gamemode, see below:
...
- Add Time as a settable (but not stored) function proptery.
- Add Function properties (They're called tempStringConfigProperties until I make them more generic. deal with it :P)
- Remove the globalgamemode setting, since it's already covered with the new perms.
When I move TempStringConfigProperty to a seperate superclass (ActiveConfigProperty) we won't have the issue of things getting set anymore, as ActiveConfigProperties will change an active setting (gamemode for example) **when** they're set, not after some cleanup function gets run. Hell. Yes.
Off to bed... I promised this commit to someone which is why it's a lil' sloppy. Sorry :( Will fix tomorrow!
2012-01-03 21:01:51 -07:00
main()
b69403e00c
I knew it...
2012-01-03 16:30:23 +01:00
main()
120009c6b4
Let's go ahead and see if everything explodes.
2012-01-03 16:26:26 +01:00
main()
940dfa4a7e
Removed unused PermissionTools in MVEntityListener
2012-01-03 15:06:47 +01:00
main()
b7d3ae039c
Improved the MVPlayerListener (style).
2012-01-03 15:03:28 +01:00
main()
5b056388a0
Style-fixes... They're driving me mad...
2012-01-03 15:01:44 +01:00
main()
cf21793262
package-info.java
2012-01-03 13:41:49 +01:00
main()
632e926098
Added missing copyright-notice
2012-01-02 11:54:29 +01:00
main()
aaa1d18865
Added MultiverseCoreListener.
2012-01-02 11:42:10 +01:00
Eric Stokes
851c6de3eb
Prettied upthe buffer, added missing values
2012-01-01 15:06:51 -07:00
Eric Stokes
9963e6f29f
Merge branch 'master' of github.com:Multiverse/Multiverse-Core
2012-01-01 13:56:33 -07:00
Eric Stokes
d31ee6a5b8
Implement MVMessaging in the Teleport command
2012-01-01 13:56:20 -07:00
main()
a5650f1f35
New "/mv version"-system.
2012-01-01 21:10:51 +01:00
Eric Stokes
736eff06ea
Add Messaging! (finally)
2012-01-01 12:56:36 -07:00
main()
ac5f249164
Fixing the next bunch of CheckStyle-warnings.
...
I just pushed this without checking it, could somebody please review this commit?
2012-01-01 20:38:37 +01:00
Eric Stokes
0841362c26
Remove * imports.
2012-01-01 11:24:19 -07:00
Eric Stokes
e344b0860d
Changed priorities of the listeners to not cancel events too soon.
...
- Add the MVPortal Adjust Listener (lowest)
- Change the PlayerListener to (High)
Remember that the priories are really just order, so if PlayerListener
was set to lowest, and cancelled the event, no one else would see it.
These changes are required for the fix that i'm finishing up for NPs
and SPs
2012-01-01 11:24:19 -07:00
main()
c0d029c71d
Fixed tests (I forgot that in 07247a1afd
)
2012-01-01 17:32:32 +01:00
main()
07247a1afd
ImportCommand now checks if the world was successfully imported.
...
Fixes #359
2012-01-01 17:28:44 +01:00
main()
47e052d180
Style-fixes. Tons of them. I was too lazy to pack them into different commits.
2012-01-01 17:22:05 +01:00
main()
da0bed3b5e
Added missing javadoc in the configuration-package.
2011-12-31 20:49:17 +01:00
main()
c9b409844f
Fixed redundant modifiers in MVWorldManager
...
... and changed Boolean to boolean
2011-12-31 20:40:28 +01:00
main()
2c392a53e6
Added missing javadoc for MVPlugin
2011-12-31 20:39:10 +01:00
main()
f18d457a83
Added javadoc for FancyText
2011-12-31 20:38:53 +01:00
main()
6f884c9308
Style-fixes in MultiverseCore.
...
Oh, and String.format is better than string concatenation.
2011-12-31 20:30:09 +01:00
main()
a45bfa4dc3
Nobody needs that anymore.
2011-12-31 20:29:20 +01:00
main()
1529f3e6dc
Lines too long... -.-
2011-12-31 19:57:22 +01:00
main()
d48927787b
Fixed MagicNumberCheck in MVWorld
2011-12-31 19:56:53 +01:00
main()
9173a15eb9
Started work on tons of new tests
2011-12-31 18:34:04 +01:00
main()
76629ebd25
Now you can't set "respawnworld" to invalid values.
2011-12-31 18:32:58 +01:00
main()
659301a808
MVWorld wants a toString()! :P
2011-12-31 18:32:58 +01:00
Eric Stokes
29ddb5e5c1
Hmm apparently Beer helps with coding, but not version control...
2011-12-30 20:15:57 -07:00
Eric Stokes
4429bdcf8e
Not sure how this stuff got left out...
2011-12-30 20:15:31 -07:00
Eric Stokes
9f12f6362b
Bump config, Add workaround for spout issue.
...
Closes #355 , Closes #149 , Closes #349
This adds a new config var: firstspawnoverride that defaults to true.
You should disable this if you don't want mv to do your spawning (if
you have Spout, a warning will print and it will be disabled
automatically. The firstspawn feature will NOT work with spout at this
time.) When the spout bug is fixed, someone should open an issue. I
will not be monitoring this :)
2011-12-30 20:14:44 -07:00
Eric Stokes
9fa29bcde7
Minor Fix: Don't warn when players join the server. That's normal :)
2011-12-29 19:05:10 -07:00
Eric Stokes
346f1591ef
Fix OPs/multiverse.* always having gamemode bypass.
...
I've added a separate namespace:
mv.bypass.gamemode.[*|X]
where X is a world name.
If a player has the * one, they ignore game mode changes GLOBALLY.
This perm defaults to FALSE, meaning OPS will NOT get it by default.
2011-12-29 18:55:24 -07:00
Eric Stokes
749ea12b4a
Change warnings to fine/finer, ref #338 (and other issues)
2011-12-25 08:53:42 -07:00
Tim Ekl
8f44a8e77a
Remove redundant TeleportIntercept
check
2011-12-22 09:50:06 -06:00
Tim Ekl
8345c83afd
Add config value (teleportintercept
)
...
New config value sets whether to attempt to block non-permissible
teleport attempts initiated from other plugins. Previous behavior
was new config value `false` - MV would not intercept these outside
teleports. New default configured value is `true` - MV will intercept
(and possibly block) other plugins' teleports.
2011-12-21 23:34:35 -06:00
Tim Ekl
6761be6952
Intercept other plugins' teleports properly
...
This commit will eventually provide a fix for #328 , when it gets merged
2011-12-21 23:20:58 -06:00
Tim Ekl
2879c2a96e
Add bonus log messages for teleport permissions
2011-12-21 22:44:26 -06:00
dumptruckman
a092dd8760
Added permission check with permissions "multiverse.gamemode.ignore.NAME" and of course "multiverse.gamemode.ignore.*"
2011-12-20 07:54:14 -05:00
dumptruckman
4246149bf2
Added checking for gamemode restriction bypass before trying to change gamemode
...
removed unreachable statement.
2011-12-20 07:54:10 -05:00
dumptruckman
c2ad331ca5
added playerCanIgnoreGameModeRestriction() to be checked before changing game modes.
2011-12-20 07:52:33 -05:00
Eric Stokes
fc24062f66
Add firstworldspawn, safe spawn disabling, fix a few neat bugs.
2011-12-19 20:03:36 -07:00
main()
2721419324
Added MVWorldDeleteEvent.
2011-12-19 20:48:14 +01:00
Tim Ekl
251b66a8d0
Additional null check; fix signportals issue 17
2011-12-18 21:16:13 -05:00
Tim Ekl
fdb8c862f9
Merge branch 'perm-errors'
...
Closes #286
2011-12-18 15:37:06 -05:00
Tim Ekl
9cfc75b7db
Mark anchor destinations valid if they pass location checks
...
This commit closes portals bug #92
2011-12-17 14:27:58 -05:00
Tim Ekl
528b448450
Condense color alternation on generator lists; closes #318
2011-12-17 13:32:34 -05:00
Tim Ekl
48f8e033b6
Add a null check around some block safety checks
2011-12-16 00:41:57 -05:00
Tim Ekl
761c3b95d9
Implement support for CommandHandler's optional error displays
...
This commit relates to #286 and will eventually close it when it gets
merged
2011-12-15 23:19:14 -05:00
Tim Ekl
1894a2e4e7
Set up config support for suppressing perms errors; relates to #286
2011-12-15 22:57:54 -05:00
main()
327f0ce7c4
Pulled some methods up into the Core-interface
...
(amended, sorry)
2011-12-12 20:59:00 +01:00
main()
5ae12022d1
Lots of javadoc-fixes
2011-12-12 20:48:55 +01:00
main()
18ccb32bfe
Javadoc-fixes + added missing @Overrides + fixed one name hiding in MVWorld
2011-12-12 20:09:21 +01:00
main()
d7303f1289
Making the constructor private broke MVA...
...
Thanks to Jenkins for immediately reporting that!
2011-12-12 19:26:00 +01:00
main()
cab8aaf040
JavadocStyleCheck: First sentence should end with a period.
...
Yes, one character can be that important. *sigh*
2011-12-12 17:40:33 +01:00
main()
ca21047859
Fixed HideUtilityClassConstructorCheck
2011-12-12 17:26:17 +01:00
main()
90305a4379
Changed ITEMS_PER_PAGE to itemsPerPage since it's not a constant.
2011-12-12 17:15:23 +01:00
main()
b2b1f91f38
Fixed warnings about RedundantModifierCheck.
2011-12-12 17:07:38 +01:00
main()
86cfa9d98f
Fixed another bunch of CheckStyle-warnings (VisibilityModifierCheck)
...
This time because of default visibility instead of private.
We need a better way for these global config variables in MultiverseCore.java
2011-12-12 16:45:54 +01:00
main()
3b784b64c0
CheckStyle-warnings about AvoidStarImport should now be fixed!
2011-12-12 16:25:10 +01:00
Eric Stokes
d7c1b8b0e2
Fix AIOOB. Fixes #303
...
Fixed an AIOOB when players had the list perm, but not perm to view any
world.
2011-12-11 12:02:01 -07:00
main()
4b53a8dfea
Mocking is better than implementing Mock-classes
2011-12-11 13:33:50 +01:00
main()
32ccfe3458
General test-cleanups
2011-12-11 13:33:49 +01:00
Eric Stokes
ddc2850632
Merge branch 'master' of github.com:Multiverse/Multiverse-Core
2011-12-10 14:15:27 -07:00
Eric Stokes
ea6b020850
Add test for Failure to select a valid command
2011-12-10 14:15:18 -07:00
main()
d40ae35505
The config was awesome, but now it's REALLY AWESOME.
...
Java generics might be weak, but they can avoid permanent casting, resulting in better code :D
2011-12-10 21:04:34 +01:00
main()
c9cd2a0f5c
Prevented properties from getting null if they were invalid in worlds.yml
2011-12-10 21:03:38 +01:00
main()
c0ae0e3eea
Javadoc wants <p>, not <p/>
2011-12-10 11:21:26 +01:00
main()
0b2233cf7b
We have to use the WorldContainer in the CreateCommand, too.
...
(This should have been changed in af439b678e
)
2011-12-10 11:04:29 +01:00
Eric Stokes
d8cb6497f0
Display the spawn location when changing it. Closes #295 .
...
I'm closing this issue and "moving" the rest of it, the ability to
import/create a world without using the checker to Issue #300
2011-12-10 00:53:02 -07:00
Eric Stokes
e5d468f03f
Fix properties not reporting when the value was wrong, but the key was.
2011-12-10 00:41:28 -07:00
Eric Stokes
a33d1420ba
Add game mode test.
...
This test should pass, but alas it fails :(
2011-12-10 00:36:40 -07:00
main()
f091a32174
Now saving mob exceptions correctly. Fixes #287
2011-12-09 16:53:50 +01:00
fernferret
10a4ec1c0b
Add WorldContainer to tests, they pass again. Yay!
2011-12-09 00:39:57 -07:00
4am
af439b678e
Changed runCommand to look in world container directory (defined in bukkit.yml) instead of in the server folder when attempting to load world files.
2011-12-08 19:19:17 -05:00
main()
5b17df65e9
Removed unused imports
2011-12-08 19:59:20 +01:00
main()
8b721886f5
Yes, the MVConfigMigrator is old and uses deprecated stuff.
2011-12-08 19:59:10 +01:00
main()
dbf109f051
Raw types are evil.
2011-12-08 19:17:55 +01:00
main()
56e4e493b1
Fixed all javadoc warnings and some typos.
2011-12-08 19:08:07 +01:00
Eric Stokes
3a5bc6adda
Actually fixed #294
2011-12-06 18:40:09 -07:00
Eric Stokes
f6e49bd8eb
Fix pitch/yaw switched for mvss on reload
2011-12-06 18:14:34 -07:00
Eric Stokes
15ce10671e
Fix colors bleeding into the next name, Fixes #285
2011-12-02 18:19:26 -07:00
Eric Stokes
a0ab24a132
Merge branch 'master' of github.com:Multiverse/Multiverse-Core
2011-11-30 19:38:58 -07:00
Eric Stokes
ee75392a9e
Fix anchor direction, Fixes #283
2011-11-30 19:38:35 -07:00
Tim Ekl
6fd7c84276
Fix Javadoc on PasteService interface
2011-11-30 11:44:18 -05:00
Tim Ekl
df5bfdde80
Allow posting to pastie.org or pastebin.com (pastie.org is the new default); closes #277
2011-11-29 20:55:13 -07:00
Tim Ekl
8e74945b7e
Add null check for files returned in world check; closes #278
2011-11-29 20:14:11 -05:00
Eric Stokes
5d2a1e478c
Fix Anchors not being saved proplery, Fix safe spawn disabling, closes #207 , Remove server.properties code, that bukkit bug is gone, closes #275
2011-11-28 00:08:39 -07:00
Eric Stokes
e110b1f6a5
Add anchors
2011-11-27 18:50:42 -07:00
Eric Stokes
803eb84f3f
Commit paginated changes, Add PermissionsTools
2011-11-27 01:42:18 -07:00
Eric Stokes
562de0f002
Fix tp perms to take into account teleporter and teleportee. This may eat your server
2011-11-26 19:38:57 -07:00
Eric Stokes
156e7ce373
Fix tests, and caught NPE
2011-11-26 17:42:58 -07:00
Eric Stokes
939a2e8b1f
Add paginated commands, Closes #203 , Add folder suggestions when your import fails
2011-11-26 17:24:17 -07:00
Eric Stokes
792d2ce5e6
Remove PaginatedCommand
2011-11-26 15:20:08 -07:00
Eric Stokes
03424165a4
Fix world.dat being adjusted every time, Fixes #268
2011-11-26 15:00:52 -07:00
Eric Stokes
f2a65b4fd9
Fix bedrespawn not being checked. Fixes #240
2011-11-26 13:01:45 -07:00
Eric Stokes
6afbd1d13d
Bump API version to 8, Remove junk, Update CommandHandler ( Closes #267 )
2011-11-26 12:33:12 -07:00
Eric Stokes
d2a5898e53
Fix seeds ( Closes #266 ), Allow Regeneration of map ( Closes #202 )
...
Fixed long seeds not loading properly (this happened with the new
config), Add Regenning of worlds. This works for the same seed, but new
seeds are still in the works.
2011-11-26 11:28:44 -07:00
main()
fa0c843f39
Improved (or broke) tests.
2011-11-26 12:07:28 +01:00
main()
459aad2d2b
Fixed NPE when there was no worlds-section in bukkit.yml
2011-11-26 12:07:28 +01:00
Eric Stokes
0fa8f4e824
Force default worlds to be imported, Closes #265
2011-11-26 01:49:46 -07:00
Eric Stokes
82eff21dbf
Revert earlier changes about using the repo, fix awesome unload bug. Now you can't unload defaultly loaded worlds
2011-11-26 00:35:07 -07:00
Eric Stokes
6bf9d1c9bb
Add Help to the Import Command
2011-11-25 22:59:06 -07:00
Eric Stokes
71bfd2a1ad
Remove submodules in favor of deployments
2011-11-25 22:45:27 -07:00
Eric Stokes
4b2152a05c
Add new world delete method ( Closes #260 ), Remove world from unloaded list when it's removed from the configs
2011-11-25 19:29:00 -07:00
Eric Stokes
6a80c8c1de
Merge branch 'fixed-tests' Closes #261
...
Tested, and the tests all pass!
2011-11-25 18:17:32 -07:00
Eric Stokes
c4dd2e3005
Much needed code re-format
2011-11-25 18:13:14 -07:00
Eric Stokes
4006e53243
Fix formatting with pullrequest, remove dragon, to @Rigby90's point, this will be bad for 3rd party addons.
2011-11-25 18:07:46 -07:00
Eric Stokes
f894859df9
Fix the pastebin.com poster (Bad API request bug)
2011-11-25 17:44:52 -07:00
sthycb
c9a33350ac
Added Support for EnderDragon purging now Supports Dragon or EnderDragon as the keyword (No changes needed to this file if this functionality is not desired) Ie: With the old code player must enter the correct "enderdragon" entering "dragon" on any other invalid keyword will report "0 - mobs purged". NOTE: This change would break for a player has a mod that has an entity called "Dragon".
2011-11-25 17:23:31 -07:00
Eric Stokes
0c847eefdf
Add more fixes that I broke when fixing #255
2011-11-25 16:57:01 -07:00
Eric Stokes
9710501a03
Fix lots of bad things with #255
2011-11-25 16:56:36 -07:00
main()
11fe1aee10
Fixed the tests. Closes #252
2011-11-25 18:02:41 +01:00
Eric Stokes
3e3990eba4
Add WorldPropertyChang event Fixes #255 , reduce the search radius until we can find a better place in the end.
2011-11-24 18:41:09 -07:00
Tim Ekl
06f53a0b47
Fix NPE on incorrect world chat color & correct in config
2011-11-23 20:02:06 -06:00
Eric Stokes
9a7c6202cc
Add bedrespawn as a per-world property. Fixes #192 . Fixes #221 .
2011-11-22 21:52:18 -07:00
Eric Stokes
5d932060ee
Removed deprecated items, Add autoload ( Fixes #241 )
2011-11-22 21:01:00 -07:00
Eric Stokes
8803374126
Fix colors not persisting through reloads
2011-11-22 19:50:52 -07:00
Eric Stokes
3c424c1c33
Fix aliases not working when setting
2011-11-22 19:41:56 -07:00
Eric Stokes
9f8e1689f6
Fix silly list mistake in worlds, fix gamemode not switching, fix a bunch of npes
2011-11-22 19:27:03 -07:00
Eric Stokes
2717a7bbee
Attempted fix for npe on worldmanager
2011-11-22 00:14:54 -07:00
Eric Stokes
29bc8bfbfc
Fix massive NPEs for real, Don't comment out tests, use @Ignore, Thanks @main--
2011-11-21 22:44:36 -07:00
Eric Stokes
d6b5fb9a25
Update for MC 1.0.0
2011-11-21 21:07:20 -07:00
Eric Stokes
e818b1ee73
Merge with test branch
2011-11-06 10:00:44 -07:00
Eric Stokes
92db828e3a
Merge branch 'master' into better-properties
2011-11-05 12:08:10 -06:00
Tim Ekl
61bed8e72d
Merge pull request #229 from Multiverse/broadcasts
...
Broadcast-Messages
2011-11-03 08:22:02 -07:00
Eric Stokes
f774d861c2
Fix typos
2011-10-23 11:01:42 -06:00
Eric Stokes
65b375edeb
Added item specific help to config properties.
2011-10-23 10:47:46 -06:00
Eric Stokes
b19799f764
Cleanup old variables
2011-10-22 17:45:03 -06:00
Eric Stokes
2e41d149fe
Done converting MVWorld, now needs testing
2011-10-22 17:38:00 -06:00
Eric Stokes
c576d5a3a2
Add the new style of saving/loading world properties.
...
All properties have been converted, but are not all implemented yet. I'm just committing because it's been several hours... o.O
2011-10-22 14:16:00 -06:00
Eric Stokes
6b95be4ca5
Add new interface, and a new paginated command, both shells
2011-10-22 11:01:05 -06:00
Eric Stokes
1712b175d8
Add autoheal and adjustSpawn as per-world properties
2011-10-22 11:00:32 -06:00
Eric Stokes
46db76a6cc
Add new test stuff
2011-10-21 18:37:18 -06:00
Eric Stokes
0e708a1f51
Move utils to a different package, add skylands to import test
2011-10-21 18:03:34 -06:00
Eric Stokes
65369b6a4b
refactor rests even more
2011-10-21 17:48:28 -06:00
Eric Stokes
ab311dd8d9
Reorged the tests, LOTS OF CLEANUP
2011-10-20 18:36:33 -06:00
Eric Stokes
3ad1bfad2b
Woohoo! All tests passgsgs
2011-10-20 17:30:29 -06:00
Eric Stokes
b028811d36
Merge branch 'master' into test
2011-10-20 16:44:02 -06:00
main()
0581415ae5
Added broadcast-messages ( Closes #197 )
2011-10-19 19:48:43 +02:00
Eric Stokes
d473ac3f78
Bump API to v7 for 2.1 release
2011-10-18 20:48:23 -06:00
Eric Stokes
093e01d865
Change priority to Low, so MV can fix portal locations
2011-10-18 18:13:22 -06:00
Eric Stokes
2d7626684f
Fix initial configs not loading properly
2011-10-18 16:45:55 -06:00
Eric Stokes
698671c700
Fix spawn not loading from config. Closes #195
2011-10-17 20:51:51 -06:00
Eric Stokes
0d06fb8a0d
Reload the config after save for the initial creation
2011-10-17 19:09:22 -06:00
Eric Stokes
6e6c40bd3b
Cannon destinations are basically exact destinations, don't perform the safety check.
2011-10-17 18:06:16 -06:00
Eric Stokes
4067d0cd28
Detect bad worlds and tell the user to use chunkster
2011-10-16 13:59:13 -06:00
Eric Stokes
5b19404c13
Clean up some comments.
2011-10-16 13:53:23 -06:00
Eric Stokes
e6f81b01d6
Move the enforce access flag to canEnterWorld so other plugins don't have to check it also, Add "mv conf show"
2011-10-16 13:38:05 -06:00
Eric Stokes
25d9231d30
Check all parent perms if the player's normal perm wasn't found. Closes #174
...
I consider this a workaround. At the moment, when we add a node AND
recalc the permissions, until the perms plugin reloads, when MV asks
the API if a player has a perm, it reports that they do NOT. For the
moment, we're going to check all of this node's parents to see if the
user has those. It stops when if finds a true or there are no more
parents.
2011-10-16 11:06:40 -06:00
Eric Stokes
3284670153
Fix Difficulty and GameMode not reloading properly. Closes #190
2011-10-16 10:14:02 -06:00
Eric Stokes
ea920c1252
Merge branch 'master' of github.com:Multiverse/Multiverse-Core
2011-10-16 09:56:47 -06:00
Eric Stokes
987e2eff51
Reorder the loading of fakepvp so it doesn't override regular pvp.
2011-10-16 09:41:47 -06:00
main()
67c165ff25
Fixed #191 (WorldManager.deleteWorld()).
2011-10-16 17:36:18 +02:00
main()
e7aa563352
Revert "Fix startup error on Windows."
...
This reverts commit 01bed7cc4b
.
Because that commit CAUSED a startup error instead of fixing one.
2011-10-16 15:29:09 +02:00
Eric Stokes
56926dc14c
State when a perm has been found in debug, Fix The TeleportCommand not obeying enforce access
2011-10-16 02:06:18 -06:00
Eric Stokes
2d0eb7e7bb
If enforceaccess == false, show all players all worlds (unless they're hidden) also for mv who
2011-10-16 00:38:49 -06:00
Eric Stokes
54e7bc454a
If enforceaccess == false, show all players all worlds (unless they're hidden)
2011-10-16 00:34:40 -06:00
Eric Stokes
01bed7cc4b
Fix startup error on Windows.
...
Psh who uses Windows anyways :P
2011-10-16 00:01:09 -06:00
Eric Stokes
728002ecce
Still not working :/ Need to simulate worlds now...
2011-10-15 12:38:34 -06:00
Eric Stokes
e45ae8f9dc
Much farther with testing. Keep testing...
2011-10-15 12:23:13 -06:00
main()
5d11e27eb0
Fixed javadoc of the WorldManager.
2011-10-15 17:24:12 +02:00
Eric Stokes
edb999578a
Seperated MockWorld tests
2011-10-15 08:20:29 -06:00
fernferret
d1f51acb1c
Add Broken tests
2011-10-15 09:47:07 -04:00
fernferret
b867df7315
Add main-- to the authors
2011-10-14 15:12:44 -04:00
fernferret
a8068a5669
Protocol Bump to v6
2011-10-13 21:39:17 -04:00
fernferret
ab17064006
Route all teleports through the SafeTTeleporter
...
There are still some access caveats. When you request that a player be
tp'd to you, there's currently not a good way to tell the teleport
event that… So we either get full control of all plugins and limited
control to override it, or unlimited control to override and no access
to other plugins' access to teleport players to potentially restricted
locations…
This will break the latest other Plugin builds.
2011-10-13 21:38:44 -04:00
fernferret
d3c1538083
Fix config.yml overwriting worlds.yml, Fix invalid spawn locations
2011-10-13 16:37:53 -04:00
fernferret
b2ef10a699
Revamp config to simpler 2.4 format
2011-10-12 21:50:03 -04:00
fernferret
fba3f71238
Fix invalid values in /mv config, Closes #178
2011-10-12 17:04:21 -04:00
fernferret
af3dcf049d
Remove outdated values from config.yml, Fix Configs and reloading, Closes #186
2011-10-12 16:50:04 -04:00
fernferret
a30222bec7
Show whether or not gamemode is being enforced, Fix enum Config Property
2011-10-11 22:51:30 -04:00
fernferret
86af11b662
Fixes for hidden worlds displaying as null
2011-10-11 21:57:35 -04:00
fernferret
750adcf376
Fix color checking, fix price reporting failure on successful set
2011-10-11 17:01:56 -04:00
fernferret
c200d43f51
Bunch of NPE fixes
2011-10-11 16:45:47 -04:00
fernferret
f4093cbe51
Implement new config items
2011-10-10 21:37:58 -04:00
fernferret
4366b16a74
Start using the new config
2011-10-10 20:40:31 -04:00
fernferret
cfdd1ac38c
Remove naming conflict with bukkit
2011-10-10 20:12:22 -04:00
fernferret
3e10f18079
Add a bunch of examples, add loadworld to the plugin.yml
2011-10-10 13:02:29 -06:00
fernferret
c7c73e7094
Implement Check Command
2011-10-10 12:28:02 -06:00
fernferret
c7e5816b2e
Add better debug for world access
2011-10-10 11:57:45 -06:00
fernferret
50a89b7b1a
Update Config.yml, implement enforceaccess
...
Cache enforceaccess and enforcegamemodes, as both of these get accessed
a lot.
2011-10-10 11:49:53 -06:00
fernferret
1aad872333
Start adding the Config Command
2011-10-10 11:31:22 -06:00
fernferret
73b42b5430
Merge branch 'master' of https://github.com/Multiverse/Multiverse-Core
2011-10-10 09:36:36 -06:00
fernferret
e93fec45ac
Much needed code reformat
2011-10-10 09:34:04 -06:00
Eric Stokes
23933c4706
Correct some javadoc
2011-10-10 07:50:03 -06:00
Eric Stokes
9e14daac1f
Implement getMvWorld
2011-10-09 21:03:05 -06:00
Eric Stokes
aa079b2920
Add Colored string to the alias, remove Double, use double
2011-10-09 20:26:23 -06:00
Eric Stokes
bac24e1c97
Use the MultiverseWorld instead of MVWorld
2011-10-09 20:10:59 -06:00
Eric Stokes
c72f602045
Fix MVINFO NPE, Fix NPE on startup with addWorld, Remove deprecated methods
2011-10-09 18:25:42 -06:00
Eric Stokes
c22a8a9d18
Implement new world creation methods
2011-10-09 18:11:36 -06:00
Eric Stokes
2759d75125
Finalize API v5
2011-10-09 16:36:05 -06:00
Eric Stokes
980381194b
Continue updating API. Fix squids not being monitored, Closes #181
2011-10-09 15:38:18 -06:00
Eric Stokes
8370a72776
Add hunger API, bump protocol to 5
2011-10-09 11:48:09 -06:00
Eric Stokes
e0f9344d20
Merge branch 'master' of github.com:Multiverse/Multiverse-Core
2011-10-09 11:43:13 -06:00
Eric Stokes
3fde98049f
Add a bunch more to the API
2011-10-09 11:31:50 -06:00
main()
40c04a1f4e
Made removePlayersFromWorld() visible from the API and moved the javadoc
2011-10-09 19:27:40 +02:00
Eric Stokes
5386aadbb7
Add new api items for hiding worlds, Move the severe perms error to a level 2 log
2011-10-09 08:51:29 -06:00
Eric Stokes
5e0903086e
Display API version, fix difficulty enums missing
2011-10-08 14:59:47 -06:00
Eric Stokes
ff47610424
Bump protocol to 4
2011-10-08 14:29:44 -06:00
Eric Stokes
84e178d12e
Bump API to version 3
2011-10-08 12:38:54 -06:00
Eric Stokes
f2a263f86c
Merge WorldManager Changes to keep the API happy
2011-10-08 12:38:23 -06:00
Eric Stokes
3c750104a5
rename some methods in the WorldManagerAPI
2011-10-08 12:36:57 -06:00
main()
f69c85e6b0
Added loadWorld(String name) to the WorldManager and made it accessible with a command
...
Added some "'" around log-messages
2011-10-08 12:28:27 -06:00