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,953 Commits 14 Branches 68 Tags 88 MiB
3f712ed5f0
Commit Graph

2953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
boy0001
34f0428d06 Added support for external generators 
- PlotSquared still handles the Plot IDs and layout, so these external
generators would need to be compatible with PlotSquared
- Server owners would still need to configure the PlotWorld settings in
the settings.yml
- Alternatively, other plugins could add their own PlotWorld class using
the existing API methods. In that case these new methods do not apply.
 2014-10-04 14:11:31 +10:00
boy0001
1511db8d12 not much actually changed, but it seems to be working fine now. 2014-10-03 23:20:33 +10:00
boy0001
8597117d7a Fixed large roads, server crashes, and DB upgrades 
Roads of 100 blocks or more will now work (WHO HAS ROADS THAT LARGE
THOUGH!?)
- We could see if we could block beacon effects from other plots...

*The crash was due to a misconstructed for loop.

Older databases will now add the missing table plot_ratings
 2014-10-03 14:01:01 +10:00
boy0001
980499a193 Time for our weekly code cleanup! 
Please tell me if doing this annoys you.
 2014-10-03 12:36:30 +10:00
Sauilitired
58ed037fad Started working on rate system :D 2014-10-02 17:38:31 +02:00