Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-09 09:59:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,340 Commits 14 Branches 68 Tags 88 MiB
5cbd2f44bd
Commit Graph

2340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sauilitired
e6849e4ace Yey! 2014-09-22 13:39:45 +02:00
Sauilitired
8a5cf06e66 Included source... 2014-09-22 13:34:46 +02:00
Sauilitired
dc91fb1630 Stuff... 2014-09-22 13:20:02 +02:00
Sauilitired
f0a27eaff4 Fixed stuff... 2014-09-22 13:03:56 +02:00
Sauilitired
2705220ece Included source... 2014-09-22 13:02:14 +02:00
Sauilitired
4ec7baec95 Use this xD 2014-09-22 13:00:45 +02:00
Sauilitired
fa7dd4a86c First Commit 2014-09-22 12:39:11 +02:00
Citymonstret
e616c3b418 Init commit 2014-09-22 06:32:58 -04:00