Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-02 08:50:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,458 Commits 13 Branches 68 Tags 88 MiB
e28c68ee74
Commit Graph

1458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sauilitired
7343686a4e Improved flag system. 2014-09-23 20:37:56 +02:00
Sauilitired
be278ad781 Improved flag system. 2014-09-23 19:02:17 +02:00
boy0001
c07634acc6 Whatever... WorldGeneration sucks. 2014-09-23 23:01:10 +10:00
boy0001
6f1572e5d2 Merge branch 'master' of http://git.intellectualsites.com/citymonstret/plot_new 
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java
 2014-09-23 21:15:47 +10:00
boy0001
3c39c6d6e6 fuckn road stipes bitches! 2014-09-23 21:12:25 +10:00
Sauilitired
ba54016720 Attempt to fix db, might not always work. We got to add a warning to spigot. 2014-09-23 12:44:57 +02:00
Sauilitired
e2c49a6e21 I like pretty configs. 2014-09-23 12:03:25 +02:00
boy0001
fd823d2910 Fixed getPlots() causing NPE 2014-09-23 19:54:06 +10:00
boy0001
f2a389f850 Removed a non-multiworld API method 2014-09-23 19:12:06 +10:00
boy0001
3075dda8d3 Merge branch 'master' of http://git.intellectualsites.com/citymonstret/plot_new 2014-09-23 19:01:06 +10:00
boy0001
1d0587dbe8 Bug fixes 
Fixed (I guess) killAllEntities()
Fixed plot clear
 2014-09-23 19:01:00 +10:00
Sauilitired
f465484c20 Small fixes 2014-09-23 09:59:45 +02:00
boy0001
5601315c41 forgot to save to DB. 2014-09-23 15:58:30 +10:00
boy0001
edfbc8d474 Should we update existing tables? Also, are you good with MySQL? 2014-09-23 15:29:38 +10:00
boy0001
0efb9d62ca more bug fixes 2014-09-23 15:28:26 +10:00
boy0001
c3e271b22b ADDED default flags in settings.yml 2014-09-23 13:40:15 +10:00
boy0001
d71ab93760 bug fixes 2014-09-23 12:47:45 +10:00
boy0001
2335b08728 Yes, I can implement that setting 
PlotWorld class:
/*
*  - All existing PlotWorld instances should be kept in PlotMain (worlds
variable)
*  - The accessors and mutators are:
*  PlotMain.isPlotWorld(world)
*  PlotMain.getPlotWorlds() or PlotMain.getPlotWorldsString() <- use
this if you don't need to get world objects
*  PlotMain.getWorldSettings(World) - get the PlotWorld class for a
world
*
*  Also added is getWorldPlots(World) as the plots are now sorted per
world
*
*  To get the world of a plot, you can use plot.world - (string)   or
plot.getWorld()  - (world object)
*
*  All PlotWorld settings are per world in the settings.yml (these
settings are automatically added when a world is loaded, either at
startup or if a new world is created):
*   - You can find this in the WorldGenerator class (yeah, it's possibly
not the best place, but it makes sure worlds are added to the
settings.yml)
*
*  All new DEFAULT CONSTANTS should be static and be given a value
*  All new variables should not be static and should not be given any
values here, but rather in the WorldGenerator class
*
*/
 2014-09-23 12:26:25 +10:00
boy0001
e2d2596bf2 Merge branch 'master' of http://git.intellectualsites.com/citymonstret/plot_new 2014-09-23 12:08:39 +10:00
boy0001
ccd237d2c0 Added plot flags to API 
- Old database will break yet again (yay!)
(Once we get more people using the plugin I'll have it add the missing
columns)
 2014-09-23 12:08:31 +10:00
Sauilitired
5168f0459f Fixed yml formatting -.- 2014-09-22 21:23:12 +02:00
Sauilitired
5730650d60 Could you implement this setting? xD 2014-09-22 21:21:14 +02:00
Sauilitired
deed728f93 Could you implement this setting? xD 2014-09-22 20:22:30 +02:00
Sauilitired
b60a8fd6f9 Schematics Fixed 2014-09-22 15:44:44 +02:00
Sauilitired
ca858ff88e Console Colour Support 2014-09-22 14:35:46 +02:00
boy0001
e4e9b80c02 Merge branch 'master' of http://git.intellectualsites.com/citymonstret/plot_new 2014-09-22 21:45:41 +10:00
Sauilitired
879dccff80 Removed web stuff (caused crash) 2014-09-22 13:44:55 +02:00
boy0001
d5420a59d7 Merge branch 'master' of http://git.intellectualsites.com/citymonstret/plot_new 2014-09-22 21:43:57 +10:00
boy0001
333a237655 bug fixes 2014-09-22 21:43:53 +10:00
Sauilitired
12ec602f7f Removed web stuff (caused crash) 2014-09-22 13:43:01 +02:00