Commit Graph

5138 Commits

Author SHA1 Message Date
Sauilitired
3508431300 Well, I broke it, sorry :( 2014-09-29 19:20:48 +02:00
Sauilitired
c60bd3bbc8 Forgot to merge... Bleh... 2014-09-29 19:11:21 +02:00
Sauilitired
1e6ae5c467 Merge remote-tracking branch 'origin/master'
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java
2014-09-29 19:07:52 +02:00
Sauilitired
b28c44b0df Economy Support (Stage 1, alpha xD)
Added schematic support for Auto
Continued working on setup command
Made sexy exception thingy
Tried to fix Errors in PWE
Added some epic captions
Added configuration options to PlotWorld
YAY
2014-09-29 19:05:03 +02:00
boy0001
e9a3b3cb9a Added auto claiming of mega plots. 2014-09-29 22:07:38 +10:00
boy0001
fe035b97f5 Auto Plot merge + some other things 2014-09-29 21:07:28 +10:00
Sauilitired
c5195fc198 Schematic Support++ 2014-09-28 10:43:44 +02:00
Sauilitired
aa0d97eb2d Merge remote-tracking branch 'origin/master' 2014-09-28 10:21:27 +02:00
Sauilitired
7a6d0ef531 More on /p setup {world}
Fixed schematic support for claim
2014-09-28 10:21:18 +02:00
boy0001
eba94c4738 We should redo the permissions to support the '*' node. 2014-09-28 17:44:03 +10:00
boy0001
2eb82fe703 Clearing a mega-plot is now deemed safe
I also reorganized the configuration.
2014-09-27 14:34:43 +10:00
boy0001
38ec36f81d Fixed texture packs 2014-09-27 14:15:59 +10:00
boy0001
7a6cef1d07 In eclipse you can use Window > Show view > Tasks 2014-09-27 11:02:10 +10:00
boy0001
f635ac219c Added a bunch of TODO statements in case you get bored 😄 2014-09-27 10:52:12 +10:00
boy0001
5298486403 Oh yeah.. I was in offline mode. That explains a lot. 2014-09-27 10:21:00 +10:00
boy0001
d8137358f1 PlotMe conversion seems to be broken 2014-09-27 10:08:00 +10:00
boy0001
c71cadafe6 Buggy behavior on plot clear
- it's slower now until I figure out why it wasn't working properly
2014-09-27 09:41:15 +10:00
Sauilitired
ebe636047f Well, started working on something totally uneeded... /p setup {world}
Fixed SQLite errors.
2014-09-26 22:53:42 +02:00
boy0001
241a70e648 Fixed unlink not adding roads correctly. 2014-09-26 22:49:34 +10:00
boy0001
e1cfde520e Finished mega plots (unlink now removes roads) 2014-09-26 22:21:14 +10:00
boy0001
c4635be66b Untested (plot unlink) 2014-09-26 21:38:18 +10:00
boy0001
7a55e8487b made changes to the converter 2014-09-26 20:13:30 +10:00
boy0001
618e2dd211 Changed version number 2014-09-26 18:34:52 +10:00
boy0001
d0ec93b15c Megaplots are pretty much done now
I still need to finish the unlinking, currently it doesn't recreate the
roads, but that's not a big deal.
2014-09-26 18:07:24 +10:00
boy0001
49f93cfb25 Plot merging now removes road 2014-09-26 15:18:13 +10:00
boy0001
ccb2e32c58 Added plot unlinking 2014-09-26 14:17:52 +10:00
boy0001
c6859a5d50 MegaPlots mostly done now
Fixed up methods throwing errors when not merged properly
Plot merge command now merges plots as far as the plugin is concerned
- Roads are not removed between the plots
- No way to unlink a merged plot

Added plot delete command (permission: plots.clear.delete)
Modified plot clear to simply clear the terrain.
2014-09-26 14:01:30 +10:00
boy0001
eb7106eb76 Fixes to merge methods
- Merged automatically added to DB
- Started work on commands
- Fixed getCurrentPlot not working for roads
2014-09-26 10:22:25 +10:00
boy0001
5d0f377d3b Fixes 2014-09-25 23:30:26 +10:00
boy0001
1d1834699a Mega plots: Tell me if I missed any important API methods
Modified methods:
- getCurrentPlot
- getPlotBottomLoc
- getPlotTopLoc

TODO:
- Commands
- Plot unlinking on unclaim
- Anything else?
2014-09-25 22:44:23 +10:00
boy0001
d54336f536 Made getCurrentPlot(location) 23.07 times faster
I apologize if you wrote the code, but it was REALLY poorly done (brute
force is bad btw). Was it taken from PlotMe?
2014-09-25 21:25:53 +10:00
Sauilitired
3f4c275d64 Merge remote-tracking branch 'origin/master' 2014-09-25 10:04:39 +02:00
Sauilitired
291f85057c Begun :D 2014-09-25 10:04:26 +02:00
boy0001
1a2ff50110 javadocs + minor restructuring 2014-09-25 16:39:13 +10:00
boy0001
f331b1abaa Fixed for worldguard 6 + fixes
- Improved plot perm checking (faster)
- Added toString() method for PlotId
- Fixed WorldGuard listener for WG 6
2014-09-25 14:58:34 +10:00
boy0001
26249d00a3 Java can be a pain sometimes...
- Fixed weird bug with plot clear
(I basically just swapped the plot.clear() method and
DBFunc.delete(plot) as referencing the plot directly afterwards added it
back to the HashMap)
2014-09-25 11:54:57 +10:00
Sauilitired
04167997ad Fixed SQLite errors
Added stacktraces to clear (Settings.DEBUG)
2014-09-24 20:53:04 +02:00
Sauilitired
0d0825d614 WorldGuard Support.
Fixed NullPointerException in C

Added Settings

Fixed tons of warning :P

Added auto clear
2014-09-24 20:29:30 +02:00
boy0001
f56d6f144b *and this 2014-09-24 22:33:34 +10:00
boy0001
4c36c9b8d8 whoops, forgot a return statement 2014-09-24 22:32:25 +10:00
boy0001
d7bd7ba093 Added plot clear on claim. AND A LOT OF OTHER MORE IMPORTANT THINGS
Like... I added that space there, between that equals sign and the word
'this'
- Re-added old plot clear algorithm (in case SetBlockFast fails)
- Made some performance improvements with plot clear
- Used built in code cleaning in eclipse to make everything look nicer
- Bug fixes
2014-09-24 22:21:43 +10:00
boy0001
874f7575c1 Fixed infinite loop in plot claim (my fault) 2014-09-24 20:30:15 +10:00
boy0001
e65d20d5f1 Teleport tamed mobs to the nearest plot. 2014-09-24 16:41:15 +10:00
boy0001
46342a7ff8 Async plot clear?
I got plot clearing down to around 100 ms for a 256x256 plot without
async.
2014-09-24 13:09:45 +10:00
boy0001
47aef8014b road stripes are now optional (as they are buggy) 2014-09-24 12:35:42 +10:00
boy0001
3a17e1ad30 Did you mean to remove these? 2014-09-24 11:24:29 +10:00
boy0001
e05636a722 sqllite 2014-09-24 11:08:45 +10:00
boy0001
f8e096a02b small changes to flags
- flag key should be only alphabetic characters
- flags should be case insensitive
2014-09-24 10:56:03 +10:00
boy0001
29d77320c3 Merge remote-tracking branch 'origin/master'
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/XPopulator.java
2014-09-24 10:46:33 +10:00
boy0001
d919dc0dbd Sudo-random plot content with data values 2014-09-24 10:41:18 +10:00