TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-02-12 03:59:22 +00:00
Code Issues Projects Releases Wiki Activity
302 commits 6 branches 12 tags 66 MiB
Commit graph

293 commits

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