EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-30 00:56:45 +01:00
Code Issues Projects Releases Wiki Activity
598 Commits 232 Branches 71 Tags 86 MiB
27b26dbe07
Commit Graph

584 Commits

Author SHA1 Message Date
boy0001
e1dea5a450 Fixed purge command 2014-12-20 11:24:29 +11:00
Sauilitired
7334d5f4f7 Minor Fixes to PlotMain 2014-12-19 01:42:47 +01:00
Sauilitired
ec3d24876e Fix after merge... 2014-12-18 12:40:30 +01:00
Sauilitired
8650525d2b Merge branch 'drtshock-master' 
Conflicts:
	PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
	PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
 2014-12-18 12:37:22 +01:00
Sauilitired
a04e207724 Merge branch 'master' of git://github.com/drtshock/PlotSquared into drtshock-master 
Conflicts:
	PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
	PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
 2014-12-18 12:35:08 +01:00
Sauilitired
7feddad853 Merge branch 'master' of git://github.com/drtshock/PlotSquared 
Conflicts:
	PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
	PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
	PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
 2014-12-18 12:32:20 +01:00
Sauilitired
555e8aaa6e Some minor stuff 2014-12-18 12:30:28 +01:00
boy0001
5140d472ff Unclaim 2014-12-18 19:23:41 +11:00
boy0001
d777b42a48 wall sign issue 2014-12-18 18:45:26 +11:00
boy0001
4f7f439a2a Fixed minor WorldEdit quirk 2014-12-18 13:36:49 +11:00
drtshock
73e92b8341 Reformat. 2014-12-17 20:15:11 -06:00
boy0001
59be72aefe Weekly code cleanup 2014-12-16 16:03:20 +11:00
boy0001
ffc7a5c7b7 delete 2014-12-16 15:59:27 +11:00
boy0001
37367adfcf Just moving a few things. 2014-12-16 15:58:54 +11:00
boy0001
a93e6b5a55 Reverting "Moved UUID classes to UUID package" as it broke stuff. 2014-12-16 15:57:40 +11:00
boy0001
4651731f65 Moved UUID classes to UUID package 2014-12-16 15:53:06 +11:00
boy0001
6a5245e268 Incremented version number 2014-12-16 15:50:50 +11:00
boy0001
b1e965bdcb * 2014-12-16 15:45:07 +11:00
boy0001
42c02b37bf Fixes plot claim block removing on clear. 2014-12-16 15:44:25 +11:00
boy0001
d2ef1c350a Safer UUID provider 2014-12-16 15:15:59 +11:00
boy0001
5a842842a2 fixed errors 2014-12-16 12:02:05 +11:00
boy0001
c9d6f78999 Does the rating command work? 2014-12-16 00:02:31 +11:00
boy0001
8a58b42629 Set sign for setowner command 2014-12-15 23:43:12 +11:00
boy0001
c8313d6cd9 [UNTESTED] Plot change owner 2014-12-15 23:40:31 +11:00
boy0001
46a00357b3 [NEEDS TESTING] [FIX] merging: roads, signs, bedrock 2014-12-15 23:23:44 +11:00
boy0001
439a5da294 @Wundero added multiple aliases 
Merged commit: 9f1cc02812b7ac5af2b08c502bdabe798ebd58c6 by @Wundero
 2014-12-15 12:33:53 +11:00
boy0001
7029069e31 Fixes 
Fixed plot auto for mega plot
Fixed an issue with SQLManager and SQLite
Added config option for max claim area for a mega plot with plot auto
Fixed an issue with UUIDHandler + online mode and old minecraft
versions.
 2014-12-15 12:04:13 +11:00
boy0001
fd306bf0a9 Reduced interval 2014-12-14 12:42:23 +11:00
boy0001
7266a2a875 Possible fix... 2014-12-14 12:34:44 +11:00
boy0001
8e6608d613 WE SERIOUSLY NEED TO FIX THIS ISSUE AT SOME POINT 
(THIS IS NOT THE OFFICIAL FIX, JUST A TEMPORARY THING)
 2014-12-14 12:12:21 +11:00
boy0001
f0d2fd93dd *Okay, so let's actually have it use lowercase unless you are forcing offline mode. 2014-12-14 12:02:18 +11:00
boy0001
d827d7d230 We had this lowercase for a reason, but why...? 
We will need to ultimately have it case sensitive.
 2014-12-14 11:55:14 +11:00
boy0001
8140581e4e Should fix glowstone 2014-12-14 01:43:12 +11:00
boy0001
29615999b9 *and must be owner 2014-12-14 01:39:11 +11:00
boy0001
5926a90cec plot delete + econ 2014-12-14 01:38:14 +11:00
boy0001
007ae51bde fixed online mode 2014-12-14 01:32:42 +11:00
boy0001
0f1dc0f58a unnecessary 2014-12-14 01:13:17 +11:00
boy0001
e3f772050e online mode 2014-12-14 00:32:42 +11:00
boy0001
760041607e Seems to work for 1.7.2 (which doesn't have UUIDs) 2014-12-14 00:30:29 +11:00
boy0001
7b203261a3 UUIDs are now Abstract 2014-12-13 22:59:43 +11:00
boy0001
176baa5c0d Plot unclaim / Setup command 2014-12-13 22:38:22 +11:00
boy0001
c528e1e87a Unclaim command 2014-12-11 18:15:30 +11:00
boy0001
b54124ff6d Fixes setup message 2014-12-11 18:02:42 +11:00
boy0001
7c35150e12 Fixed road issue 2014-12-07 01:19:35 +11:00
boy0001
eeb2e90042 Fixed helper issue 2014-12-06 01:15:36 +11:00
boy0001
00b50a3b9c incremented version number 2014-12-04 15:05:54 +11:00
boy0001
17f2a89c66 Additional mask checking for WE 2014-12-04 15:00:08 +11:00
boy0001
0fca78c61a fixes owner bug 2014-12-01 09:38:49 +11:00
boy0001
a424bb006f Faster plot clearing for large plots. + sudo async. 
- Optimized the plot clearing algorithm (biome + entity clearing)
- Reduced immediate load by separating clearing into multiple tasks
- Clearing 512x512 plot takes ~4.5 seconds
 2014-11-30 15:59:41 +11:00
boy0001
a028f4685b This should be first 2014-11-28 18:55:08 +11:00
boy0001
bc81d5a0d1 v2.3.3 2014-11-27 15:30:28 +11:00
boy0001
4293e8f3f9 item frame 2014-11-27 15:06:18 +11:00
boy0001
37d6f9c4d1 We don't want droppers included. 2014-11-25 13:29:53 +11:00
boy0001
5a787fcfaf Some blocks aren't safe e.g. Spawners, falling blocks could cause lag. 2014-11-25 13:19:32 +11:00
Sauilitired
5885badc23 Check out PlotWorld.java 2014-11-21 23:55:30 +01:00
Sauilitired
75a5a76fe9 A whole load of fixes 2014-11-21 23:45:46 +01:00
boy0001
c25eccf4a0 inbox 2014-11-21 17:14:36 +11:00
boy0001
d79d32dac1 . 2014-11-21 14:35:36 +11:00
boy0001
2a9119c7c3 Merge remote-tracking branch 'origin/master' 
Conflicts:

	PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
 2014-11-21 14:14:33 +11:00
boy0001
5cfcedeab8 NMS chunk sending (rather than using refresh chunk) 2014-11-21 14:11:41 +11:00
Sauilitired
ef7e021937 Some additional JavaDoc's (PlotMain.class) 
Added option to teleport to road on login
 2014-11-20 19:29:05 +01:00
Sauilitired
7b83ea2413 More documentation :_: 2014-11-20 00:00:38 +01:00
Sauilitired
6f73193cfb Bleh, wrong folder xD 2014-11-19 18:49:53 +01:00
Sauilitired
ea7e771cae Updated documentation 2014-11-19 18:48:20 +01:00
Sauilitired
3499cf1341 Some database fixes 2014-11-19 18:18:18 +01:00
Sauilitired
a4f55dc3f6 Minor fixes 
JavaDoc Fixes
Useful additions
 2014-11-19 18:05:09 +01:00
Sauilitired
8261b944b2 Fixed lots of "warnings", and minor stuff. 
Deprecated old Plot Constructor(s)
 2014-11-19 17:46:30 +01:00
Sauilitired
5f9927cda7 Merge remote-tracking branch 'origin/master' 2014-11-19 17:16:22 +01:00
Sauilitired
568f6b36bd Documented the API even further 2014-11-19 17:16:11 +01:00
boy0001
a00f38e91f fixed help dis/total 2014-11-19 12:10:40 +11:00
Sauilitired
6e1ca16121 Removed warnings on listeners 2014-11-18 23:40:24 +01:00
Sauilitired
4e552b870d Added a listener 2014-11-18 23:21:08 +01:00
Sauilitired
f555f194e1 Started working on a plot info inventory 2014-11-18 23:17:55 +01:00
Sauilitired
69b8f6080b Begun making the flag values... generic, and really abstract. 2014-11-17 19:18:05 +01:00
Sauilitired
6997f8675b removed file 2014-11-16 11:16:49 +01:00
Sauilitired
7d4bf6d1c2 Removed folder 2014-11-16 11:15:42 +01:00
Sauilitired
ebd058d4ac Documentation 2014-11-16 11:11:36 +01:00
Sauilitired
0f371f203a Wth 2014-11-16 10:52:48 +01:00
Sauilitired
23d88763d1 Major Restructure 2014-11-16 10:48:19 +01:00
Sauilitired
38c7edbddd Some optimization to PlotMeConverter. 2014-11-16 10:16:38 +01:00
Sauilitired
07895be660 Minor fixes :D 2014-11-16 09:56:42 +01:00
Sauilitired
d257ddb90d Merge remote-tracking branch 'origin/master' 2014-11-16 09:43:45 +01:00
Sauilitired
0a66fad271 Should work better :D 2014-11-16 09:43:30 +01:00
boy0001
d8801b17cf fixes teleport 2014-11-16 12:16:23 +11:00
Sauilitired
56cb409a43 Removed static access 2014-11-15 12:53:26 +01:00
Sauilitired
0914b7bec9 Minor remake xD 2014-11-15 12:29:30 +01:00
Sauilitired
8f8fa01389 Added database command 2014-11-15 12:05:48 +01:00
boy0001
0017b73bdb Fixes to SQL 2014-11-12 19:09:08 +11:00
boy0001
e6c5f824df These somehow were undone at some point 2014-11-11 13:23:45 +11:00
boy0001
c9204b3590 some fixes 2014-11-10 21:54:36 +11:00
boy0001
7d304d3eb2 What's with this FIXME thing? Have you broken something? 2014-11-10 20:15:55 +11:00
boy0001
278b8bc0c3 Saving flags properly 2014-11-10 20:13:07 +11:00
boy0001
af04881965 block ignite 2014-11-10 18:28:29 +11:00
boy0001
ec754c39b7 plot info and flags 2014-11-10 09:55:50 +11:00
Sauilitired
f8db0ceec5 Added op + deop aliases (trusted) 2014-11-09 19:27:46 +01:00
Sauilitired
790bb4e948 Added ban/unban aliases. Made "plot.settings.getBiome()" return the actual biome. Fixed a colour error 💥 2014-11-09 17:22:53 +01:00
Sauilitired
1b9a42d3c9 Cloning :D 2014-11-09 17:02:45 +01:00
Sauilitired
9309855df2 Piston stuff 
Pretty help menu
 2014-11-09 16:55:43 +01:00
Sauilitired
182f4cbd22 Fixed a heckload of warnings 2014-11-09 12:51:17 +01:00
Sauilitired
87a0cecb2f Cleanup of PlotMain 2014-11-09 12:29:35 +01:00
boy0001
8966799b66 It needs craftbukkit in order to do a lot of these tests. 2014-11-09 14:16:23 +11:00
boy0001
2211a8fb24 fixes (some test cases don't pass) 2014-11-09 12:45:52 +11:00
Sauilitired
e7f9030757 Fix :D 2014-11-09 00:00:48 +01:00
Sauilitired
ee89e9cb2e At least have the decency of using utf8-codes 💥 2014-11-08 23:53:04 +01:00
boy0001
7e208afbe2 invalid symbols? 2014-11-09 09:34:46 +11:00
Sauilitired
77ee6d2b81 Merge remote-tracking branch 'origin/master' 2014-11-08 22:48:13 +01:00
Sauilitired
0a6f2aa357 Changed to TranslationAPI 2014-11-08 22:47:45 +01:00
Sauilitired
f6b408d977 Shouldn't be there... 2014-11-08 21:05:16 +01:00
Sauilitired
b15ccdc789 Remove some TODO-lidos 2014-11-08 21:02:52 +01:00
Sauilitired
4df3535a43 Allow for console plot clearing. 2014-11-08 21:00:43 +01:00
Sauilitired
a39d50843e Removed all warnings in the main file -> updated to new copyright format (please do this for any file you edit) 2014-11-08 20:46:49 +01:00
Sauilitired
4bfe5f6453 Fixed GPLv3 copyright issue ;) 2014-11-08 20:37:34 +01:00
Sauilitired
7fd21a4657 Fixed copyright for borrowed code :p 2014-11-08 20:35:00 +01:00
Sauilitired
f71fabbfbf Some optimization, fixed copyright. 2014-11-08 20:27:09 +01:00
boy0001
bcc34e7cd8 should be a player command 2014-11-08 23:17:59 +11:00
boy0001
20cfa053e5 fixes #39 2014-11-08 21:35:49 +11:00
boy0001
a9c78e491e fixes #38 2014-11-08 12:42:35 +11:00
boy0001
c22a476908 incremented version number 2014-11-08 12:01:12 +11:00
boy0001
c606b4d893 Hows this? 2014-11-07 22:15:19 +11:00
boy0001
12c476f3c2 fixed bugs 2014-11-07 21:30:29 +11:00
boy0001
487aa93986 Merge remote-tracking branch 'origin/master' 
Conflicts:

	PlotSquared/src/main/java/com/intellectualcrafters/plot/PlayerFunctions.java

	PlotSquared/src/main/java/com/intellectualcrafters/plot/StringComparsion.java
 2014-11-07 08:07:27 +11:00
boy0001
627400558b fixes #37 2014-11-07 08:04:41 +11:00
Sauilitired
536ae7fe2f Some minor improvements to the MainCommand code. 2014-11-06 09:46:37 +01:00
Sauilitired
0ff50aed11 Experimenting with String comparison, and help methods 2014-11-06 09:37:46 +01:00
Sauilitired
87773d4929 Created a better plot hashcode thingy 2014-11-06 09:29:49 +01:00
boy0001
a30e8eec9a various fixes 2014-11-06 18:23:21 +11:00
boy0001
766dc0f703 temp fix 2014-11-05 22:01:59 +11:00
boy0001
cb10f39753 Fixed help menu/plot delete -> plot exit not being called 2014-11-05 15:27:49 +11:00
boy0001
bddaadd31d weekly code cleanup 2014-11-05 14:42:52 +11:00
boy0001
61c3fe2805 What you've done is more dangerous 
With the setOp thing, it's all on the main thread and the op is taken
away immediately afterwards so there is no possibility of them using the
elevated permission for anything other than worldguard. I even had a
finally clause.

What you have done, although it may not seem too dangerous, it still
gives players the opportunity to use their elevated permissions.
 2014-11-04 12:22:09 +11:00
Sauilitired
3c5f88c0be Some improvements, I still have to test the setowner stuff, seemed a bit dangerous to give OP :3 2014-11-03 20:36:50 +01:00
Sauilitired
adae7f3cf0 Derp 2014-11-03 18:05:12 +01:00
boy0001
687ad4cb9f more test cases 2014-11-03 21:14:55 +11:00
boy0001
aaab7ee0c7 I should be more confident about the future of the plugin 
PlotSquared now supports WorldEdit 6+ (including the potential for
WorldEdit v50)
 2014-11-03 20:11:55 +11:00
boy0001
b47231ca8c Would this classify as a test case? 2014-11-03 20:08:57 +11:00
boy0001
9fcab4ba87 fixed tab completion 2014-11-03 17:53:10 +11:00
Sauilitired
5c24fc092d Splot commands into pages = YAY 2014-11-02 21:49:26 +01:00
Sauilitired
c5bd4c4935 Better list! 
Even added argument suggestion (so proud of that class xD<3)
Fixes #8
 2014-11-02 21:14:47 +01:00
Sauilitired
c883f2f7d9 Fixes #17 
Creates #32
 2014-11-02 20:11:06 +01:00
Sauilitired
291c290f15 Titles are now optional xD 
Fixes #27
 2014-11-02 20:03:43 +01:00
Sauilitired
82b17aeebf Claimed wall block 
Fixes #28
 2014-11-02 20:01:04 +01:00
boy0001
45d8556b87 [UNTESTED] Added plot commenting 2014-11-02 14:45:52 +11:00
Sauilitired
2dc935eed6 Fixed errors :D 2014-11-01 16:22:22 +01:00
Sauilitired
5b62523003 :D Tab completion 2014-11-01 16:13:44 +01:00
Sauilitired
fd81546bab Added better way to lookup blocks 2014-11-01 15:59:35 +01:00
boy0001
6044ca63c2 fixes 2014-11-01 09:29:08 +11:00
boy0001
007b9ee298 Merge branch 'master' of https://github.com/IntellectualCrafters/PlotSquared 2014-10-31 10:19:41 +11:00
boy0001
51f718dcac Added debug category 2014-10-31 10:19:36 +11:00
Sauilitired
c63cdbf5a6 Merge remote-tracking branch 'origin/master' 2014-10-30 16:16:42 +01:00
Sauilitired
f6deb20483 Added: 
Commands:
 Music Subcommand
Flags:
 notify-enter
 notify-leave
 item-drop
 invincible
 instabreak
 drop-protection
 forcefield
 heal
 feed
 greeting
 farewell
 2014-10-30 16:16:26 +01:00
boy0001
97b9198d77 fixes 2014-10-30 22:32:04 +11:00
boy0001
5395852cf0 Async schematic pasting 
- We should replace the schematic on claim with this.
- worldedit listener now listens to plot deletion
- debugclaimtest command no longer pastes any schematics if there is on
set
 2014-10-30 17:24:58 +11:00
boy0001
0aaf573186 we could just drop support for worldedit... 2014-10-29 22:26:50 +11:00
boy0001
0d305463fc So that's how you're meant to do it. 2014-10-29 19:15:58 +11:00
boy0001
f60bac0e0e Fixed plot auto algorithms and 
also made some performance improvements
 2014-10-29 17:18:22 +11:00
Sauilitired
13a2d4234b Beguin working on a better way to handle SQL syntax :D 2014-10-28 17:03:19 +01:00
Sauilitired
40e6b7e165 Temp. "fix" 2014-10-28 11:07:12 +01:00
Sauilitired
3181b1db71 Fixed errors!!!! 2014-10-28 10:46:29 +01:00
Sauilitired
a582e036e8 Merge remote-tracking branch 'origin/master' 2014-10-28 10:21:04 +01:00
Sauilitired
3c5eead8c7 Added maven support, removed camera subcommand 2014-10-28 10:20:52 +01:00
boy0001
6c8535785a fixed MySQL taking too long to load for large servers. 2014-10-28 18:54:41 +11:00
boy0001
64314723c9 fixes 2014-10-28 13:34:26 +11:00
Sauilitired
595db4a51f Some documentation updates 2014-10-28 01:57:14 +01:00
Sauilitired
be846c2e98 Updated to use the new API :D 2014-10-27 22:32:24 +01:00
Sauilitired
dea069ca52 Ability to disable the usage of the custom UUID API 2014-10-27 22:00:24 +01:00
Sauilitired
e3ce39eff4 New UUID API. Added JSON libraries. API can be self hosted ~ http://paste.intellectualsites.com/view/dMglEhXguo57rqF1Yaty4uqMgNl1Hjqu9Gr 2014-10-27 20:05:01 +01:00
Sauilitired
ad60cb4f4a Updated API JDocs 2014-10-27 16:27:17 +01:00
Sauilitired
947ad1446f Test push :D 2014-10-27 16:09:26 +01:00
Sauilitired
4cccb5c607 Added underscore, we need to inform people about this change (otherwise they might go bonkerz when they notice that their plots are gone xD) 2014-10-27 15:42:21 +01:00
Sauilitired
5ca8bddd3b Whoops, forgot to fix it for SQLite :3 2014-10-27 15:39:38 +01:00
Sauilitired
41a40954fb Added prefix support :D 2014-10-27 15:32:15 +01:00
boy0001
5de8f6bf9b fixed fly 2014-10-27 07:56:44 +11:00
boy0001
e3e18b259d bug fixes??? 
Josh was having trouble loading the worlds, so calling the load method
twice somehow fixed it??
 2014-10-26 23:17:03 +11:00
boy0001
5c51a46271 formatting schematic name 2014-10-26 12:47:50 +11:00
boy0001
72f64a18d5 settings.schematic_save_path 2014-10-26 12:25:40 +11:00
boy0001
2d5b54ec0d . 2014-10-26 12:19:35 +11:00
boy0001
3938184655 Merge remote-tracking branch 'origin/master' 
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java
 2014-10-26 11:07:12 +11:00
boy0001
d4e0397187 forgot to export schematic in GZIP format. Whoops. 2014-10-26 11:05:54 +11:00
Sauilitired
f3055074df Well... bleh 2014-10-25 16:34:25 +02:00
Sauilitired
a8ffbd21dc Even better colour (+ character support). You evil person who force stringutil-check-thingies 2014-10-25 16:30:37 +02:00
Sauilitired
bf3402306f Support for colour codes 2014-10-25 16:15:13 +02:00
Sauilitired
6f4f432402 Added schematic save path setting 2014-10-25 15:02:38 +02:00
Sauilitired
542b01736b Removed web and fixed the flag sutff 2014-10-25 14:59:08 +02:00
Sauilitired
3e7a52f263 Merge remote-tracking branch 'origin/master' 2014-10-25 14:46:21 +02:00
Sauilitired
04b7855f6e Attempt to do stuff with flags xD 2014-10-25 14:46:04 +02:00
boy0001
768cb8b293 updated schematic format 2014-10-25 20:09:26 +11:00
boy0001
33acc95d92 more fixes. 2014-10-25 16:40:21 +11:00
boy0001
ed3003a2f6 Fixed exportall command (spigot would attempt to restart because of lag) 2014-10-25 16:34:06 +11:00
boy0001
760921a43b Added exportall command 2014-10-25 15:37:45 +11:00
boy0001
20554f7ed1 Added command to save a schematic. 2014-10-25 15:27:12 +11:00
boy0001
1a9f10951d flag fixes. 2014-10-25 11:16:15 +11:00
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