EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-30 17:16:43 +01:00
Code Issues Projects Releases Wiki Activity
467 Commits 232 Branches 71 Tags 86 MiB
24954744cb
Commit Graph

454 Commits

Author SHA1 Message Date
Sauilitired
3c5f88c0be Some improvements, I still have to test the setowner stuff, seemed a bit dangerous to give OP :3 2014-11-03 20:36:50 +01:00
Sauilitired
adae7f3cf0 Derp 2014-11-03 18:05:12 +01:00
boy0001
687ad4cb9f more test cases 2014-11-03 21:14:55 +11:00
boy0001
aaab7ee0c7 I should be more confident about the future of the plugin 
PlotSquared now supports WorldEdit 6+ (including the potential for
WorldEdit v50)
 2014-11-03 20:11:55 +11:00
boy0001
b47231ca8c Would this classify as a test case? 2014-11-03 20:08:57 +11:00
boy0001
9fcab4ba87 fixed tab completion 2014-11-03 17:53:10 +11:00
Sauilitired
5c24fc092d Splot commands into pages = YAY 2014-11-02 21:49:26 +01:00
Sauilitired
c5bd4c4935 Better list! 
Even added argument suggestion (so proud of that class xD<3)
Fixes #8
 2014-11-02 21:14:47 +01:00
Sauilitired
c883f2f7d9 Fixes #17 
Creates #32
 2014-11-02 20:11:06 +01:00
Sauilitired
291c290f15 Titles are now optional xD 
Fixes #27
 2014-11-02 20:03:43 +01:00
Sauilitired
82b17aeebf Claimed wall block 
Fixes #28
 2014-11-02 20:01:04 +01:00
boy0001
45d8556b87 [UNTESTED] Added plot commenting 2014-11-02 14:45:52 +11:00
Sauilitired
2dc935eed6 Fixed errors :D 2014-11-01 16:22:22 +01:00
Sauilitired
5b62523003 :D Tab completion 2014-11-01 16:13:44 +01:00
Sauilitired
fd81546bab Added better way to lookup blocks 2014-11-01 15:59:35 +01:00
boy0001
6044ca63c2 fixes 2014-11-01 09:29:08 +11:00
boy0001
007b9ee298 Merge branch 'master' of https://github.com/IntellectualCrafters/PlotSquared 2014-10-31 10:19:41 +11:00
boy0001
51f718dcac Added debug category 2014-10-31 10:19:36 +11:00
Sauilitired
c63cdbf5a6 Merge remote-tracking branch 'origin/master' 2014-10-30 16:16:42 +01:00
Sauilitired
f6deb20483 Added: 
Commands:
 Music Subcommand
Flags:
 notify-enter
 notify-leave
 item-drop
 invincible
 instabreak
 drop-protection
 forcefield
 heal
 feed
 greeting
 farewell
 2014-10-30 16:16:26 +01:00
boy0001
97b9198d77 fixes 2014-10-30 22:32:04 +11:00
boy0001
5395852cf0 Async schematic pasting 
- We should replace the schematic on claim with this.
- worldedit listener now listens to plot deletion
- debugclaimtest command no longer pastes any schematics if there is on
set
 2014-10-30 17:24:58 +11:00
boy0001
0aaf573186 we could just drop support for worldedit... 2014-10-29 22:26:50 +11:00
boy0001
0d305463fc So that's how you're meant to do it. 2014-10-29 19:15:58 +11:00
boy0001
f60bac0e0e Fixed plot auto algorithms and 
also made some performance improvements
 2014-10-29 17:18:22 +11:00
Sauilitired
13a2d4234b Beguin working on a better way to handle SQL syntax :D 2014-10-28 17:03:19 +01:00
Sauilitired
40e6b7e165 Temp. "fix" 2014-10-28 11:07:12 +01:00
Sauilitired
3181b1db71 Fixed errors!!!! 2014-10-28 10:46:29 +01:00
Sauilitired
a582e036e8 Merge remote-tracking branch 'origin/master' 2014-10-28 10:21:04 +01:00
Sauilitired
3c5eead8c7 Added maven support, removed camera subcommand 2014-10-28 10:20:52 +01:00
boy0001
6c8535785a fixed MySQL taking too long to load for large servers. 2014-10-28 18:54:41 +11:00
boy0001
64314723c9 fixes 2014-10-28 13:34:26 +11:00
Sauilitired
595db4a51f Some documentation updates 2014-10-28 01:57:14 +01:00
Sauilitired
be846c2e98 Updated to use the new API :D 2014-10-27 22:32:24 +01:00
Sauilitired
dea069ca52 Ability to disable the usage of the custom UUID API 2014-10-27 22:00:24 +01:00
Sauilitired
e3ce39eff4 New UUID API. Added JSON libraries. API can be self hosted ~ http://paste.intellectualsites.com/view/dMglEhXguo57rqF1Yaty4uqMgNl1Hjqu9Gr 2014-10-27 20:05:01 +01:00
Sauilitired
ad60cb4f4a Updated API JDocs 2014-10-27 16:27:17 +01:00
Sauilitired
947ad1446f Test push :D 2014-10-27 16:09:26 +01:00
Sauilitired
4cccb5c607 Added underscore, we need to inform people about this change (otherwise they might go bonkerz when they notice that their plots are gone xD) 2014-10-27 15:42:21 +01:00
Sauilitired
5ca8bddd3b Whoops, forgot to fix it for SQLite :3 2014-10-27 15:39:38 +01:00
Sauilitired
41a40954fb Added prefix support :D 2014-10-27 15:32:15 +01:00
boy0001
5de8f6bf9b fixed fly 2014-10-27 07:56:44 +11:00
boy0001
e3e18b259d bug fixes??? 
Josh was having trouble loading the worlds, so calling the load method
twice somehow fixed it??
 2014-10-26 23:17:03 +11:00
boy0001
5c51a46271 formatting schematic name 2014-10-26 12:47:50 +11:00
boy0001
72f64a18d5 settings.schematic_save_path 2014-10-26 12:25:40 +11:00
boy0001
2d5b54ec0d . 2014-10-26 12:19:35 +11:00
boy0001
3938184655 Merge remote-tracking branch 'origin/master' 
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java
 2014-10-26 11:07:12 +11:00
boy0001
d4e0397187 forgot to export schematic in GZIP format. Whoops. 2014-10-26 11:05:54 +11:00
Sauilitired
f3055074df Well... bleh 2014-10-25 16:34:25 +02:00
Sauilitired
a8ffbd21dc Even better colour (+ character support). You evil person who force stringutil-check-thingies 2014-10-25 16:30:37 +02:00
Sauilitired
bf3402306f Support for colour codes 2014-10-25 16:15:13 +02:00
Sauilitired
6f4f432402 Added schematic save path setting 2014-10-25 15:02:38 +02:00
Sauilitired
542b01736b Removed web and fixed the flag sutff 2014-10-25 14:59:08 +02:00
Sauilitired
3e7a52f263 Merge remote-tracking branch 'origin/master' 2014-10-25 14:46:21 +02:00
Sauilitired
04b7855f6e Attempt to do stuff with flags xD 2014-10-25 14:46:04 +02:00
boy0001
768cb8b293 updated schematic format 2014-10-25 20:09:26 +11:00
boy0001
33acc95d92 more fixes. 2014-10-25 16:40:21 +11:00
boy0001
ed3003a2f6 Fixed exportall command (spigot would attempt to restart because of lag) 2014-10-25 16:34:06 +11:00
boy0001
760921a43b Added exportall command 2014-10-25 15:37:45 +11:00
boy0001
20554f7ed1 Added command to save a schematic. 2014-10-25 15:27:12 +11:00
boy0001
1a9f10951d flag fixes. 2014-10-25 11:16:15 +11:00
boy0001
90d327d80c whoops. 2014-10-25 00:12:20 +11:00
boy0001
eb35ba5fb0 fixes 2014-10-25 00:08:21 +11:00
boy0001
c367dfa510 Added plot info categories. 2014-10-24 16:50:48 +11:00
boy0001
d2107e0176 worldguard regions now support owner changes 2014-10-24 14:12:07 +11:00
boy0001
a67e03fec4 Added percentage support for block lists (untested) 
e.g.
(I put block names instead of Ids as I can't remember what they are)
floor
- 90%stone
- 5%gravel
- 1%diamond
- 4%tnt

It doesn't need to add up to 100%, they are just ratios. so there is 1
part diamond to 90 parts stone. People's brains just work better when
using percentages.
 2014-10-24 11:29:18 +11:00
boy0001
2ffb2d08a6 should be fixed now. 2014-10-24 00:41:57 +11:00
boy0001
3fd51a5658 Merge remote-tracking branch 'origin/master' 
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
 2014-10-24 00:25:01 +11:00
boy0001
ce2de462b0 chat color support in flags 2014-10-24 00:24:31 +11:00
Sauilitired
77153e8880 Fixed events... 2014-10-23 15:12:49 +02:00
boy0001
127f876d8e Fixed PlotMe converter for MultiWorld and vanilla Bukkit 2014-10-23 22:55:54 +11:00
boy0001
356923d3e8 BlockStates also don't seem to want to copy over using /plot paste 2014-10-23 21:44:19 +11:00
boy0001
f39d31836d states don't work :/ 2014-10-23 21:39:55 +11:00
boy0001
7f669b4207 Added plot swapping (untested) 2014-10-23 21:21:27 +11:00
boy0001
c7a1ad5c17 forgot this class 2014-10-23 18:27:01 +11:00
boy0001
8f2de99001 Finished updating to new permissions system. 2014-10-23 18:23:09 +11:00
boy0001
d2df275000 Added plot swap method. 2014-10-23 18:09:54 +11:00
boy0001
bcb1ddeccb You should finish the web interface at some point. 
- Added functions to get / save a schematic.
 2014-10-23 13:50:11 +11:00
boy0001
cc5fb76c7a Made converter run sync, to reduce bugs. 2014-10-23 12:29:43 +11:00
Sauilitired
d33f3ac409 Only display flags which the user is permitted to use. 2014-10-22 19:28:02 +02:00
boy0001
2f90adac52 fixes. + added DebugClaimTest command 2014-10-22 23:22:00 +11:00
boy0001
b0351b5c99 Bug fixes. 2014-10-22 19:46:41 +11:00
boy0001
e548cd8158 Making the database stuff abstract: 
This will make it easier to add support for MongoDB
 2014-10-22 17:09:01 +11:00
Sauilitired
ed6df3e700 Remove le line 2014-10-22 08:01:35 +02:00
boy0001
cfbf0086fa Working on plot commenting... Can you do the DB stuff? 2014-10-22 16:21:57 +11:00
boy0001
6a050f5287 fixed economy and old plot removal task 
*I need to update AdvPlots due to these changes as well.
 2014-10-22 10:04:44 +11:00
Sauilitired
ee9cee6ec8 * Added Fly Flag 
* Moved stuff away from the actual listener class
* Ability to delete plot on player ban
 2014-10-21 19:01:34 +02:00
Sauilitired
a80c044b3e Merge remote-tracking branch 'origin/master' 
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java
 2014-10-21 18:59:24 +02:00
Sauilitired
7bd6ee5f33 * Added Fly Flag 
* Moved stuff away from the actual listener class
* Ability to delete plot on player ban
 2014-10-21 18:53:52 +02:00
boy0001
c55faaec8d Fixes 2014-10-21 20:58:52 +11:00
boy0001
3bbd0a2293 Flags and plot users 2014-10-21 18:11:10 +11:00
Sauilitired
bc4c99bf3a Merge remote-tracking branch 'origin/master' 2014-10-21 08:18:37 +02:00
Sauilitired
bf7c36a637 Will now clear stuff :3 2014-10-21 08:18:30 +02:00
boy0001
9ad7a6d6ab fixed sign id 2014-10-21 16:51:50 +11:00
Sauilitired
5759e3e761 Fixed set command -> not allowing unclaimed plots 2014-10-21 07:44:17 +02:00
boy0001
9427bc7773 Changed version number 2014-10-21 16:36:47 +11:00
Sauilitired
264baf10e3 Fixed plot deletion 2014-10-21 07:35:15 +02:00
boy0001
66d596b993 fixes 2014-10-21 15:31:27 +11:00
boy0001
42a3ec0561 ... 2014-10-20 22:58:40 +11:00
boy0001
5e27ff52b8 Finished new PlotMeConverter 2014-10-20 21:42:50 +11:00
boy0001
c57e518143 New PlotMe converter... untested 2014-10-20 20:50:54 +11:00
boy0001
794ef7a01e fixes for plot clearing 2014-10-20 19:45:41 +11:00
Jesse Boyd
27c011f488 Working on PlotMeConverter 
Re-organized some debug messages to display messages in a better format.
 2014-10-20 19:04:59 -07:00
boy0001
92178ee696 This should be a debug setting. 2014-10-19 22:45:14 +11:00
boy0001
a79a3adcba fixed some really weird bugs... 
like WTF, how does checking event.getTo() cause the player spawns to
change!?
 2014-10-19 22:12:23 +11:00
boy0001
3796f41be3 Added flag value checks 2014-10-19 21:27:27 +11:00
Sauilitired
e767834144 Sort of forgot to actually change the players time... 2014-10-19 11:17:40 +02:00
Sauilitired
a18ac3ad05 Simple bug fixes + exception printing (debug for now) 2014-10-19 11:14:50 +02:00
Sauilitired
8b18c46926 Fix :3 2014-10-19 11:03:06 +02:00
Sauilitired
a57e8f938a Fixed caption 2014-10-19 10:47:59 +02:00
Sauilitired
fde2e84d1a Merge remote-tracking branch 'origin/master' 2014-10-19 10:46:12 +02:00
Sauilitired
e8d657eb5d Some fixes :p 2014-10-19 10:45:41 +02:00
boy0001
c0383851a8 Added plot purge for plot ID 2014-10-19 19:26:42 +11:00
Sauilitired
83ca1a55f0 Well, I knew it... 2014-10-19 10:22:50 +02:00
Sauilitired
bb43365538 Merge remote-tracking branch 'origin/master' 2014-10-19 10:19:47 +02:00
Sauilitired
8f411a3ce4 I'm sure I broke something :_: 2014-10-19 10:19:38 +02:00
boy0001
c8c4f1d848 made changes to plot clear/signs being removed 2014-10-19 18:29:39 +11:00
boy0001
b4f987e470 fixed concurrentModificationException 2014-10-19 17:37:17 +11:00
boy0001
7ce30ee955 more fixes 2014-10-19 17:19:01 +11:00
boy0001
093b38c4c3 fixes 2014-10-19 17:15:13 +11:00
boy0001
c8fe54e685 changed version number 2014-10-19 14:13:33 +11:00
Sauilitired
7f57b22e56 Gamemode :D 2014-10-18 14:10:57 +02:00
Sauilitired
dae0b00e35 Merge remote-tracking branch 'origin/master' 2014-10-18 13:55:11 +02:00
Sauilitired
15252ea94b Gamemode 2014-10-18 13:44:51 +02:00
boy0001
2edec161a8 my bad 2014-10-18 21:28:15 +11:00
Sauilitired
e4cd1bdc56 Flags :D 2014-10-18 12:12:32 +02:00
Sauilitired
7e62094152 Flags :D 2014-10-18 10:57:45 +02:00
Sauilitired
5d73a2fd6a Merge remote-tracking branch 'origin/master' 2014-10-18 10:24:59 +02:00
Sauilitired
86a4dbded8 Some global settings :D 2014-10-18 10:24:48 +02:00
boy0001
b23d4f26e6 actually fixed purge 2014-10-18 18:45:07 +11:00
boy0001
441d4dde2e fixed purge command 2014-10-18 15:54:16 +11:00
boy0001
04e8c5a8c4 added startMerge to plotManager 2014-10-18 15:49:08 +11:00
boy0001
fc9a31cbf4 fixed NPE from teleport event 2014-10-18 13:36:30 +11:00
boy0001
cb8822cd6a bug fixes. 2014-10-18 13:24:47 +11:00
Jesse Boyd
9ba5e3f91b It's probably better to put it here actually. 2014-10-18 11:37:30 -07:00
Jesse Boyd
6c614d1eec Fixed duplicate users potentially being added 2014-10-18 11:33:48 -07:00
Jesse Boyd
96fb8cfab9 Reload now reloads a bit more. 2014-10-18 11:30:25 -07:00
Jesse Boyd
a64e4c9578 *console commands 
Added plot purge
 2014-10-18 11:24:18 -07:00
Jesse Boyd
0010b06afa Added support for console messages (untested) 2014-10-18 11:06:29 -07:00
Jesse Boyd
2435eab96a sendMessage now supports console 2014-10-18 10:22:08 -07:00
boy0001
eee4a44fcb it's working now. (so far at least) 2014-10-15 21:36:23 +11:00
boy0001
47d26531aa "borrowing" some jnbt code 2014-10-15 21:23:32 +11:00
boy0001
1c4100a612 Untested (should work) 2014-10-15 20:43:20 +11:00
boy0001
e7d44d5343 Forgot about unlinking 2014-10-15 19:53:28 +11:00
Sauilitired
0961671eaf Fixed the uuid saving functions, added ability to change caching methods. 2014-10-14 16:16:05 +02:00
Sauilitired
2bbcdb17bc Started working on functions that will allow for a saved UUID cache (i.e mysql, sqlite, txt file etc...) for faster reading and in-caching. 2014-10-13 21:22:19 +02:00
Sauilitired
4ba147b95f Fixed some translations. 2014-10-13 19:59:35 +02:00
Sauilitired
b85c2a3c76 Fail :P 2014-10-13 19:43:41 +02:00
Sauilitired
a19b13fded Clipboard command (for info...) 2014-10-13 19:40:30 +02:00
boy0001
2b22ebf3d8 Documenting some methods 2014-10-13 17:44:05 +11:00
boy0001
4403edf7ca Multiple bug fixes 
Plot clearing also now requires an unlink if mega.
Copy paste now requires an unlink if mega
*We should fix this at some later point
Plot merging now checks the entirety of both mega plots being merged
(rather that just the two adjacent)
 2014-10-13 17:33:37 +11:00
Sauilitired
9087d48d9a Copy and paste, doesn't work for mega plots. 2014-10-12 17:26:58 +02:00
boy0001
254b9d4053 close stream 2014-10-12 23:08:48 +11:00
Sauilitired
8bdbd3e628 Yer, forgot that :P 2014-10-12 10:48:08 +02:00
Jesse Boyd
05c1ed139c fixed sqlite somehow... 
and plot merging
 2014-10-12 12:44:59 -07:00
Jesse Boyd
9b6d3e2b14 config fixes 2014-10-12 10:53:36 -07:00
Sauilitired
8245db7a08 Pfft. 2014-10-12 01:18:47 +02:00
Jesse Boyd
1772002700 actually fixed it 2014-10-12 10:13:44 -07:00
Jesse Boyd
b5037fe878 Merge branch 'master' of http://git.intellectualsites.com/citymonstret/plot_new 2014-10-12 09:56:23 -07:00
Jesse Boyd
34dd6c8107 fixed plot home 2014-10-12 09:56:17 -07:00
Jesse Boyd
532cc72076 fixed plot merging not saving 2014-10-12 01:37:16 -07:00
Jesse Boyd
0f7b5a4526 bugs bugs and more bugs 2014-10-12 01:15:00 -07:00
Jesse Boyd
3ffb182a3c yo yo yo 
testing some new formatting rules + bug fixes
 2014-10-12 00:37:36 -07:00
Sauilitired
53878c1a66 You can't divide by 0, stupid... 2014-10-11 18:35:51 +02:00
Sauilitired
88fe47b7ee Yes, I am really stupid... -_- 2014-10-11 18:30:24 +02:00
Sauilitired
0160a39d9f I am stupid. 2014-10-11 18:24:50 +02:00
Sauilitired
446cd422e0 Well, some stuff... 2014-10-11 18:16:08 +02:00
boy0001
79e0459a3a jdoc 2014-10-11 19:51:48 +11:00
boy0001
6b028988b3 Bug fixes 2014-10-11 19:05:50 +11:00
Jesse Boyd
6c1527f41c Finished setup command. 2014-10-11 12:09:14 -07:00
Jesse Boyd
a6375796c0 No red files anymore. Some stuff still unfinished. 
+ weekly code cleanup
 2014-10-11 00:33:10 -07:00
Jesse Boyd
2f5f3ac8e2 Plugin compiles now (many commands don't work) 2014-10-10 22:29:20 -07:00
Jesse Boyd
b50dfcb423 I'm making progress 2014-10-10 22:19:33 -07:00
boy0001
882c427d2b Merge remote-tracking branch 'origin/master' 
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java

	PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java
 2014-10-10 18:37:44 +11:00
boy0001
3656ec5297 Breaking things... 
...
 2014-10-10 18:31:51 +11:00
Sauilitired
ef443cade3 Added money given on delete. 2014-10-08 19:31:59 +02:00
Sauilitired
1ddb6b3bdc I hope this works... 2014-10-08 17:31:02 +02:00
Sauilitired
8315121d66 Yup. 2014-10-08 16:26:46 +02:00
Sauilitired
508b17a2a6 Improved economy (multiplies price * plots) :D 
Added you to plugin.yml
 2014-10-08 16:15:25 +02:00
Sauilitired
949bd6c9f5 Updated plugin info: New link, total downloads + newest version 2014-10-08 16:06:06 +02:00
boy0001
a89c062dbc I don't think I need this anymore. 2014-10-08 22:58:50 +11:00
boy0001
e3ad7ede8c some code documentation. 2014-10-08 22:51:19 +11:00
boy0001
2aff00c088 Finished coding default world generation classes 
Now I just need to do is fix all the errors I created as well as point
the static methods to the newly abstracted ones.
 2014-10-08 22:23:18 +11:00
boy0001
101b726319 Only 7 methods left which need to be coded 2014-10-08 21:42:13 +11:00
boy0001
74a6d2d28a More changes... 2014-10-08 20:02:08 +11:00
boy0001
0d55e1a2dc Continued externalization of generators. 
- Please ignore all the errors, I am not commiting all the classes I
have changed.
 2014-10-08 16:53:09 +11:00
Sauilitired
c476e07c28 Merge remote-tracking branch 'origin/master' 2014-10-08 07:14:40 +02:00
Sauilitired
ee86310988 Economy + schematics for /p auto :P 2014-10-08 07:11:46 +02:00
boy0001
10079579f2 whoops, forgot I was in the middle of something. 2014-10-08 16:09:28 +11:00
boy0001
2a35ec963c SO MANY!!!! bug fixes 2014-10-08 16:07:35 +11:00
boy0001
30f1f829cb further bug fixes 2014-10-07 22:35:01 +11:00
Sauilitired
da3ceeab44 I seriously doubt this is working xD 2014-10-06 14:51:28 +02:00
boy0001
1dd0b5de5f Fixed 2014-10-06 22:42:49 +11:00
boy0001
dc80fce05d possible fixes? 2014-10-06 21:56:23 +11:00
boy0001
7c643ed535 Trusted/Helpers changes 2014-10-06 20:47:43 +11:00
boy0001
bde2e45e6b A lot will need to be changed to implement this... 2014-10-05 22:19:35 +11:00
boy0001
4e08ae2a54 Are you okay with what I'm doing? 2014-10-05 14:57:47 +11:00
boy0001
fbd9766cfa added Abstract PlotWorld class 2014-10-05 14:44:33 +11:00
boy0001
5f787d45fa Started work on abstract PlotManager class 2014-10-05 13:58:35 +11:00
boy0001
5f0d914b07 stuff. 2014-10-04 16:01:45 +10:00