EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-27 07:36:45 +01:00
Code Issues Projects Releases Wiki Activity
2,134 Commits 232 Branches 71 Tags 87 MiB
7fb2631421
Commit Graph

261 Commits

Author SHA1 Message Date
Jesse Boyd
00340d5154 Important fix 2016-05-14 01:13:08 +10:00
MattBDev
d47eeff23b Cleaning and Fix #1108 2016-05-12 18:00:38 -04:00
MattBDev
0958b57e46 Tidy code. 2016-05-12 17:09:35 -04:00
Jesse Boyd
0095af0ce5 Flag info 2016-05-13 03:38:32 +10:00
Jesse Boyd
dee8072d83 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 
# Conflicts:

#	Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java

#	Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java
 2016-05-13 03:04:43 +10:00
Jesse Boyd
63c7041a34 Flag tweaks 2016-05-13 02:55:57 +10:00
MattBDev
3be0f74498 Fix #1098 2016-05-10 13:41:59 -04:00
MattBDev
e63b436edd Possible build everywhere fix. 2016-05-06 22:05:31 -04:00
Paulomart
5d8492b675 Fixes cast exception 2016-05-05 13:13:55 -04:00
MattBDev
421203a27d Bug Fix and Cleanup 2016-04-29 18:14:12 -04:00
MattBDev
8f3d35bca3 Bug Fix and Cleanup 2016-04-28 16:38:51 -04:00
MattBDev
669359cd37 General changes 2016-04-26 10:14:22 -04:00
MattBDev
2c16c767e7 Fix flag values being loaded as strings 2016-04-26 08:40:52 -04:00
Jesse Boyd
d8849f718c Fix plotworld get 2016-04-26 09:32:16 +10:00
Jesse Boyd
8c56affb2f Fix for paint 2016-04-25 03:58:47 +10:00
MattBDev
1bce69d288 Merge flags to master 2016-04-22 23:54:53 -04:00
MattBDev
c266b1a428 Merge flags to master 2016-04-22 23:54:19 -04:00
MattBDev
e57af63af4 Possible remove fix. 2016-04-22 23:46:16 -04:00
MattBDev
74ed10c376 Completed and ready to test 2016-04-22 23:46:16 -04:00
MattBDev
aaf9511673 Start implementing new Flag system. 2016-04-22 23:46:16 -04:00
Jesse Boyd
d3dd88eb8d Fixes #1062 2016-04-22 23:45:19 -04:00
Jesse Boyd
9b22f38ff0 Fix plot download/done 2016-04-22 23:45:19 -04:00
Jesse Boyd
7c12a20a2b perm requirement for add/trust * 2016-04-22 23:45:19 -04:00
Jesse Boyd
40e063e702 Fixes #1050 2016-04-22 23:45:19 -04:00
Jesse Boyd
1c04b1a0e0 Fixes #1062 2016-04-19 15:32:31 +10:00
Jesse Boyd
02d17b363d Fix plot download/done 2016-04-17 03:55:55 +10:00
Jesse Boyd
30a2c5d881 perm requirement for add/trust * 2016-04-13 03:35:14 +10:00
Jesse Boyd
76c3879c1f Fixes #1050 2016-04-13 02:41:40 +10:00
Jesse Boyd
588f5d7ebc Fixes #1047 2016-04-09 22:48:27 +10:00
Jesse Boyd
45b6950111 Fixes chat error / plot deny * 2016-04-07 03:33:49 +10:00
Jesse Boyd
8b10b7109c Merge remote-tracking branch 'origin/master' 
# Conflicts:

#	Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java

#	Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java
 2016-04-07 02:33:23 +10:00
Jesse Boyd
f7810860da Re-add WorldEdit check 2016-04-07 02:14:50 +10:00
MattBDev
d49de5297b Tweaks 2016-04-05 23:50:04 -04:00
MattBDev
3df772aa4e Fixed #852 and small changes 
Hid updater error when debugging is not enabled.
Javadoc changes
 2016-04-05 19:10:26 -04:00
MattBDev
9c81dfa5c3 Cleanup and Optimizations 
Abstracted TitleManagers
Removed a lot of Statics.
ETC.
 2016-04-05 12:53:40 -04:00
Jesse Boyd
fab60a0d53 Fix schematic on claim/auto 2016-04-05 11:07:37 +10:00
MattBDev
95c9fd01dd Merged 2016-04-04 12:49:11 -04:00
manuelgu
6ab3a029b2 Add teleport on death feature 2016-04-04 11:31:15 +02:00
manuelgu
4da38a6f9c Add bypass permission to breaking blocks at y0 2016-04-04 00:09:46 +02:00
Jesse Boyd
dffa00858d More than 2 lines 2016-04-02 17:15:36 +11:00
MattBDev
4ebd778c62 Optimizations and a purge fix 2016-04-02 01:30:26 -04:00
MattBDev
8243e0118a Optionals introduced, code cleaned, potential purge fix 2016-04-01 19:14:46 -04:00
Jesse Boyd
b909792d6a typo in disable titles 2016-04-01 06:54:28 +11:00
Jesse Boyd
4a7112a0a5 Various 
Add some 1.9 blocks to chest content with schematic paste
Restructure tileentity placement from schematic (will soon add signs
etc)
Prepare for release 3.3.3
 2016-04-01 04:23:26 +11:00
Jesse Boyd
edd18a7178 Various 
- Fix some block change issues (for some reason sending a chunk would
sometimes reset any recent changes)
- Send chunk changes for relight command
- Have kick cmd kick the player from the server if they are kicked from
the spawn plot
- Plot size checks for downloading
- Fix some potential integer overflow issues for large plots (>64K x
64K)
- Fix some edge cases for plot move/copy
 2016-03-31 20:49:00 +11:00
manuelgu
25dfc34695 Comma-separate plot area list again 2016-03-30 15:25:25 +02:00
manuelgu
ea17ba8e46 Fix sponge conflicts 2016-03-30 15:09:00 +02:00
manuelgu
6fc8bf587b Comma-separate list of plot worlds 2016-03-30 14:43:16 +02:00
manuelgu
429fed2ab3 Fix target command 
Threw an exception when you didnt pass an argument
 2016-03-30 14:43:04 +02:00
manuelgu
510b9a47dc Formatting 2016-03-30 14:42:41 +02:00
manuelgu
44e11e9c6b Add command to list all available scripts 
Additional debugexec subcommand
 2016-03-30 14:42:34 +02:00
Jesse Boyd
1f6ad47a79 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Bukkit/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java
 2016-03-30 12:12:19 +11:00
Jesse Boyd
312ad4c48c fix index 2016-03-30 12:09:55 +11:00
MattBDev
31d346a587 Minor code cleanup 
Plus an optimization
 2016-03-29 17:00:07 -04:00
MattBDev
6007f040cd OCD 2016-03-29 15:47:59 -04:00
Jesse Boyd
bbe43f782c Fix nested command configuration 2016-03-30 04:47:47 +11:00
Jesse Boyd
560ebf412b Relight command 2016-03-30 04:34:48 +11:00
Jesse Boyd
df630f9be1 Remove outdated copyright notice at the top of each file 
- No license is the same as all rights reserved
- There's already a license at the root of the project
- The message was not in most files. easier to remove it
- Support link isn't valid
- No longer just the bukkit API
 2016-03-30 02:50:13 +11:00
Jesse Boyd
578e884be7 Merge pull request #1025 from manuelgu/master 
Cleanup
 2016-03-29 20:08:33 +11:00
manuelgu
22f56d4da6 Remove ChatColor 
Sponge support
 2016-03-29 10:57:27 +02:00
Jesse Boyd
745f9c4858 Buy 2016-03-29 19:52:57 +11:00
manuelgu
5f2856e0ea Cleanup 
Consistent use of String[] instead of String...
Removed unused variables
 2016-03-29 10:47:56 +02:00
Jesse Boyd
d9c6d04b46 Debug PlotMe conversion (temporary) 2016-03-29 19:13:48 +11:00
Jesse Boyd
512ae38392 Fix plot kick args 2016-03-29 18:57:35 +11:00
Jesse Boyd
19ef76de33 Oh, and this 2016-03-29 18:51:10 +11:00
Jesse Boyd
638f267498 Remove required args for visit 2016-03-29 18:48:07 +11:00
Jesse Boyd
bc8becae8e Check for null 2016-03-29 18:47:04 +11:00
Jesse Boyd
ef4438889b Fix plot move 2016-03-29 18:09:40 +11:00
Jesse Boyd
9bd3f2cbfd Fix plot list add 2016-03-29 17:56:48 +11:00
Jesse Boyd
eed8cbec5a Fixes #1015 2016-03-29 17:39:29 +11:00
Jesse Boyd
5f8a55568c Fix plot rate categories 2016-03-29 17:21:58 +11:00
Jesse Boyd
5275d4ec62 Fix "cleanup" breaking plugin again 2016-03-29 17:13:19 +11:00
Jesse Boyd
30dc20b3b3 Fix "Fixes #1015" not resetting the home location. 
Resetting involves clearing the current value i.e. so it respects
whatever is set in the config, if that value is changed.
 2016-03-29 17:06:58 +11:00
MattBDev
32ba55baf5 Code cleanup and Optimizations 2016-03-29 00:56:44 -04:00
MattBDev
49d18b9229 Code cleanup 2016-03-28 23:26:44 -04:00
MattBDev
b1fa258688 Code cleanup 2016-03-28 19:30:55 -04:00
Matt
874da8c5bc Merge pull request #1019 from manuelgu/master 
Fixes #1018
 2016-03-28 18:17:45 -04:00
MattBDev
76e2b1f416 Code cleanup 
maybe a bug fix or two
 2016-03-28 17:31:40 -04:00
manuelgu
83fa310fbb Fix ArrayIndexOutOfBoundsExceptions 
Occured for /plot trust and /plot add
 2016-03-28 23:18:29 +02:00
MattBDev
8d4f042abc Cleanup of code 2016-03-28 13:28:21 -04:00
MattBDev
feee63b3af Fix DebugLoadTest 2016-03-28 13:02:20 -04:00
manuelgu
c2e48bb95b Fixes #1015 2016-03-28 16:27:32 +02:00
Jesse Boyd
d9c0ec27b0 Fixes #774 2016-03-28 23:04:08 +11:00
Jesse Boyd
dcd1a50a0c default tab completion + plot chat for merged plots 2016-03-28 22:52:29 +11:00
manuelgu
8f0de80755 Update Plugin command to show correct version 
Not using PS.get().update but rather reading from the GitHub releases. Can be changed if needed/wanted
 2016-03-28 11:29:58 +02:00
MattBDev
978be89e52 Fix bug causing the Updater to not work. 2016-03-27 23:48:24 -04:00
Jesse Boyd
1bf05df706 Try this coolty 2016-03-27 16:01:53 +11:00
Jesse Boyd
53e56a6414 Fix required args 2016-03-27 07:11:09 +11:00
Jesse Boyd
46d3dc609e Update sponge port 2016-03-27 06:47:34 +11:00
Jesse Boyd
056f77a3ba 3.3.2 2016-03-27 03:34:55 +11:00
Jesse Boyd
d4d9a9e148 Change to SubCommand 2016-03-26 20:28:45 +11:00
Jesse Boyd
6a7cf0d56f forgot to push this 2016-03-26 16:44:38 +11:00
Jesse Boyd
f74e7bb4cb Fixes #997 for 1.8 2016-03-25 14:50:57 +11:00
manuelgu
65d428a989 Rename PlotGamemode to PlotGameMode 
@MattBDev I think you just forgot renaming the class
 2016-03-24 23:06:45 +01:00
Jesse Boyd
7ab8d22325 Move confirmation to commands.yml 2016-03-25 02:03:36 +11:00
Jesse Boyd
ed62ed2487 Fixes #983 2016-03-24 22:08:07 +11:00
Jesse Boyd
8a42eecc11 Command changes 
Legacy commands still need to be cleaned up (after which economy /
confirmation can be centralized)
All command names / usage / description is configurable
Simplifies creating commands
Deeper tab completion / command help
 2016-03-24 20:57:59 +11:00
MattBDev
a62b9a334d Cleaning 2016-03-24 00:50:25 -04:00
MattBDev
48f22eaed4 More cleaning 2016-03-23 13:13:09 -04:00
MattBDev
bb4700aa5a More cleaning 2016-03-23 13:09:13 -04:00
MattBDev
9e2c6f2182 Major code reformatting 2016-03-22 21:41:39 -04:00
manuelgu
35c7c20874 Track renamed Music.java file 2016-03-22 18:53:56 +01:00
manuelgu
84188f6557 Cleanup 2016-03-22 18:53:17 +01:00
Matt
09ee7f3048 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
#	Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
#	Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
#	Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
#	Core/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
 2016-03-20 23:03:31 -04:00
Matt
029241912b Code Style Cleanup 2016-03-20 22:52:16 -04:00
MattBDev
cb0b59fdb4 Merge branch 'feature/rm-redundant-methods' of https://github.com/manuelgu/PlotSquared into manuelgu-feature/rm-redundant-methods 2016-03-20 19:52:11 -04:00
MattBDev
bb4ecb94a1 Cleanup 2016-03-20 19:35:40 -04:00
manuelgu
df12e53d40 Remove redundant .s() methods 2016-03-20 23:19:37 +01:00
Matt
19b6df8268 Cleanup 2016-03-19 14:07:55 -04:00
Jesse Boyd
8074d041b8 Fix "Cleaner reflection" breaking plugin. 
Also add method to sort plots by modification date.
 2016-03-19 17:32:05 +11:00
Jesse Boyd
fe43143bdb Fixes #972 2016-03-18 03:33:31 +11:00
Jesse Boyd
9e32ce9885 Automatically drop unique_alias for MySQL 2016-03-18 03:05:36 +11:00
Jesse Boyd
3921fdfc3f Fixes #967 2016-03-18 02:18:18 +11:00
Jesse Boyd
e1e5497558 Fixes #871 2016-03-18 02:06:06 +11:00
Jesse Boyd
f9db269813 Various 
Close #966
Close #953
(duplicates)
Changes to chunk copying etc to interfere less with world generation
 2016-03-18 01:22:51 +11:00
Jesse Boyd
98c4483535 Various 
some sponge stuff
schematic/mca/bo3 uploading rework
fix minor issue with plot visit
fix #956
 2016-03-17 20:11:07 +11:00
Matt
58eeeb16d4 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-03-16 10:16:19 -04:00
Matt
65ddb12701 Beginning rewrite of Flags and various cleanups 2016-03-16 10:15:38 -04:00
zomb
a297d505f8 Pulled files from official repository 2016-03-15 22:15:47 -10:00
zomb
a26db46242 Pyromania 
Adds block-ignition, which allows fire being set by players,
dispensers, explosions, and fireballs (if their origin is the same as
the plot that they land in)

Adds fire-spread, which allows fire to spread from lava and fire
spreading in general

Adds block-burn, which allows blocks to burn away
 2016-03-15 21:59:01 -10:00
Matt
3fb64d9811 Added snow-melt flag 2016-03-15 01:16:29 -04:00
Matt
bb8883dfaf Added snow-melt flag 2016-03-14 11:01:52 -04:00
Matt
bee6f83e79 Various changes 2016-03-14 02:18:04 -04:00
Matt
ae885eafca Various changes and Merge Economy Fix 2016-03-13 22:44:59 -04:00
Matt
dfd29f6713 Various changes 
Plot class is now more reliable as most fields are private
Cleanup some classes.
Fixes #955
makes progress on #953
 2016-03-13 14:09:48 -04:00
Jesse Boyd
a8fd1b49ca Various 
sponge changes / documentation / cleanup / event tweak
 2016-03-13 03:57:36 +11:00
Jesse Boyd
66da71bc9f Various 
Fixes a few typos
Fixes #943
Fixes #944
Fixes metrics (broke in b69e31129d)
Fixes plot setup issue
Fixes some lighting issues
Fixes ChunkListener + cauldron
Tweak some  schematic stuff
 2016-03-11 15:33:39 +11:00
Matt
33222b25a3 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-03-08 21:41:47 -05:00
Matt
57fa265b48 Optimizations and cleaning. 
Fixes #943 (even though it should be impossible)
 2016-03-08 21:18:54 -05:00
Jesse Boyd
f391ae444f remove java 8 code 2016-03-08 14:09:50 +11:00
Matt
286e5b8b97 Minor performance improvements. 2016-03-07 15:28:59 -05:00
Jesse Boyd
b59665b00b Fix #938 2016-03-07 19:37:53 +11:00
Jesse Boyd
62531a42c7 Fix for @Htgan / clear 
Possibly fixes #932
 2016-03-07 17:34:57 +11:00
Jesse Boyd
05caa2ca8d Fixes #935 2016-03-06 23:46:37 +11:00
Jesse Boyd
00c174fdf1 Various 
Progress on #929
Fix area loading from config with negative ids @skroob
 2016-03-06 19:08:01 +11:00
Jesse Boyd
b95fdeccca Maybe? 2016-03-06 19:08:01 +11:00
Matt
32d4a08db1 Small cleanup 2016-03-04 19:53:31 -05:00
Matt
5c60d69fd1 closes #915 2016-03-04 16:37:38 -05:00
Jesse Boyd
780d4e09d5 Delay economy hook #922 2016-03-04 05:04:11 +11:00
Jesse Boyd
0408e9a37c Sorry, I'll fix it. 2016-03-03 07:34:59 +11:00
Jesse Boyd
f00ac79c91 Bump version / misc 
Fix regenallroads
Add schematic y_offset
Change visit/list for multi-owner plots
Fix updater (pre-1.7.10)
 2016-03-02 17:42:04 +11:00
Jesse Boyd
109715e0d7 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-03-02 06:59:05 +11:00
Jesse Boyd
8bf3ceac6f Changes 
Plot auto clear confirmation
Add timediff to keep flag
Add expired parameter to list cmd
Fixes some compatibility issues
 2016-03-02 06:56:50 +11:00
Matt
9596544f97 Cleanup Code 
I also updated the build.gradle and pom to 1.9 bukkit
 2016-02-29 20:13:18 -05:00
Matt
5079361fbf Fix negation issue. 2016-02-29 11:50:04 -05:00
Matt
b0a3f70cbd Updater now uses GitHub Releases and API 2016-02-29 11:15:51 -05:00
Jesse Boyd
841809b93d Various 
Closes #906
Add command confirmation for setowner
Require confirmation delayed by 1 tick
 2016-03-01 02:01:52 +11:00
Jesse Boyd
43b7a7aba8 Fixes #910 2016-02-29 15:12:20 +11:00
Jesse Boyd
5c4178b1dd Fixes 
Fixes #905
Fixes auto claim limit
 2016-02-29 04:09:09 +11:00
Matt
911bef974a Stop spectating before being kicked when denied. 
Fixes #886
 2016-02-27 20:11:18 -05:00