Commit Graph

100 Commits

Author SHA1 Message Date
Jesse Boyd
e7fa9e01be
Fixes #1419 2016-11-30 15:43:23 +11:00
MattBDev
77281017d4 Fixes #1428 , Fixes #1431 2016-11-20 22:24:27 -05:00
Jesse Boyd
5ed2190cb3 Fixes #1369 2016-09-30 23:32:49 +10:00
Jesse Boyd
61022b717a Fixes #1360 2016-09-21 13:42:59 +10:00
MattBDev
8e7e5dcb25 Cleanup
Signed-off-by: MattBDev <mattbdev@outlook.com>
2016-09-14 12:16:22 -04:00
MattBDev
b6dac54677 Code cleaning and Gradle Update
Updated gradle wrapper to 3.0
Updated Gradle files for Nukkit
Added/cleaned minor Nukkit code
Removed duplicate TitleManagement code

Signed-off-by: MattBDev <mattbdev@outlook.com>
2016-09-13 18:10:01 -04:00
Jesse Boyd
85ff8bf639 Minor tweaks 2016-09-07 00:28:01 +10:00
Jesse Boyd
0557671b80 Recover from third party generator error 2016-09-04 14:22:01 +10:00
Jesse Boyd
61d00e51ef Fixes #1303 2016-08-26 03:02:50 +10:00
Alex
634802ef98 Got rid of that auto-optimize-imports option 2016-08-08 23:20:31 +02:00
Alex
37e4a652dd Now calling the respective events when a user is removed from a plot.
And switched the event calling of adding Helpers and Trusted players. (Correct me if that was wrong)
2016-08-08 22:45:08 +02:00
MattBDev
112da17614 Squashed commit of the following:
commit 91c78407cd
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 11:29:59 2016 +1000

    Use a queue for expiry

commit 395d6364be
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 04:43:41 2016 +1000

    Cache on fail as well

commit facd43700d
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 04:00:50 2016 +1000

    Cache entity count every second

commit 1ae694ff5b
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 03:52:37 2016 +1000

    Tweak entity counting

commit c99dd1e74a
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sat Aug 6 00:10:11 2016 +1000

    Needs sponge builds

commit f408ac82be
Author: Alexander Söderberg <Sauilitired@users.noreply.github.com>
Date:   Fri Aug 5 12:13:39 2016 +0200

    Update README.md

commit 9b95990ba6
Author: Alexander Söderberg <Sauilitired@users.noreply.github.com>
Date:   Thu Aug 4 16:50:37 2016 +0200

    Update this here as well
2016-08-08 14:02:25 -04:00
MattBDev
adc021109f Added Polar Bear where missing 2016-07-25 22:25:15 -04:00
MattBDev
85d6e42462 Merge branch '3.4.5' of https://github.com/IntellectualSites/PlotSquared into 3.5.0 2016-07-24 17:27:41 -04:00
MattBDev
8538170cba Metrics 2016-07-16 22:51:49 -04:00
Jesse Boyd
e2c57cea52 . 2016-07-12 23:56:59 +10:00
MattBDev
a579df00db Merge remote-tracking branch 'origin/master' 2016-06-27 10:14:28 -04:00
Jesse Boyd
817a5bc16e Various
Fix compatibility with bukkit 1.5
Recover on failed fancy message initialization
Fix /2 remove *
2016-06-27 18:38:14 +10:00
Jesse Boyd
7da0b9877f Fixes #1221 (the NPE at least) 2016-06-26 17:07:46 +10:00
Jesse Boyd
3ced832b80 Fix biome stripes (whoops) 2016-06-18 13:15:50 +10:00
Jesse Boyd
081081b36e Fixes #1063 2016-06-17 15:42:23 +10:00
Jesse Boyd
b2997b7c7b Don't send duplicate messages 2016-06-16 10:31:33 +10:00
Jesse Boyd
4f0ede646e Chat / Merge blocks placer / generator 2016-06-13 14:47:50 +10:00
MattBDev
93deebf4ca 1.10 fixes 2016-06-10 13:31:28 -04:00
Jesse Boyd
951a6b82a2 simplify config / multiple expiry tasks / block cache fix 2016-06-05 17:28:43 +10:00
Jesse Boyd
ca5d3a818b PlotBlock cache / events / flags 2016-06-04 06:20:13 +10:00
MattBDev
cee970e3d9 Tweaked some things 2016-06-02 13:42:32 -04:00
MattBDev
da58c7b411 Beautify code 2016-06-02 11:38:47 -04:00
MattBDev
53e4b728a6 Merge remote-tracking branch 'origin/master' 2016-05-28 22:38:10 -04:00
MattBDev
4af846967c Fix #958 2016-05-28 22:37:56 -04:00
manuelgu
ceb8fb9fa3 Implement PlotComponentSetEvent 2016-05-25 21:49:55 +02:00
MattBDev
0958b57e46 Tidy code. 2016-05-12 17:09:35 -04:00
MattBDev
7947c3fdd7 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-05-12 15:43:44 -04: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
63472ebeaf Merge branch '3.3.4'
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java
2016-05-11 16:45:17 -04:00
MattBDev
d5cf81be5c 1.9.4 compatibility. 2016-05-11 12:11:46 -04:00
MattBDev
1db3d1aa72 Start 3.3.4 work to support 1.9.4 2016-05-11 11:16:38 -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
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
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
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