Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-22 10:36:06 +01:00
Code Issues Projects Releases Wiki Activity
769 Commits 59 Branches 50 Tags 18 MiB
generate-structures
Commit Graph

683 Commits

Author SHA1 Message Date
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