Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-04 13:53:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,421 Commits 14 Branches 69 Tags 89 MiB
7f42cbb67f
Commit Graph

1034 Commits

Author SHA1 Message Date
MattBDev
9ad45750ee Unclaiming a plot should call plotExit() 2016-12-09 20:58:05 -05:00
MattBDev
a554ae5633 Potential fix for commands 2016-12-09 16:58:32 -05:00
Jesse Boyd
7b1c4a5042
Check border when claiming a plot 
Also fixes #1467
 2016-12-10 01:09:07 +11:00
Jesse Boyd
9fc464e896
Shorter border teleportation 2016-12-10 00:44:42 +11:00
Jesse Boyd
bec11b244e
Use the correct plot id 2016-12-10 00:26:40 +11:00
Jesse Boyd
dc94418b51
Only expand border to current plot. 2016-12-09 23:52:48 +11:00
Jesse Boyd
2b561f2efa
Rename to ice-form 2016-11-30 19:06:03 +11:00
Jesse Boyd
81418b07a8
Fixes #1438 (unless other things call this event) 2016-11-30 16:15:20 +11:00
Jesse Boyd
7c6c19ba63
Fixes #740 2016-11-30 16:07:16 +11:00
Jesse Boyd
2e23ae0811
Fixes #1243 2016-11-30 16:00:47 +11:00
Jesse Boyd
28e7f5bc08
Fixes #1349 
Non standard plot managers/areas not supported
 2016-11-30 15:57:24 +11:00
Jesse Boyd
5642fd3899
Fixes #1359 
plots.chat.color
and
PLOT_CHAT_SPY_FORMAT
 2016-11-30 15:36:13 +11:00
Jesse Boyd
95f8aaa2fe
this could be here? 2016-11-30 13:10:36 +11:00
Jesse Boyd
878010255c
Java 9 2016-11-28 18:02:03 +11:00
MattBDev
8d442f58d4 Fixes #1445 2016-11-26 12:05:08 -05:00
MattBDev
dc673f9715 Fixed #1440 , Fixed #1446 2016-11-26 11:55:38 -05:00
Jesse Boyd
deb5441bcf
*Fix compile error 2016-11-24 11:05:28 +11:00
Jesse Boyd
8ebf71c87f
DB fix 2016-11-24 10:19:00 +11:00
Jesse Boyd
9fd53af483
Add world argument 2016-11-23 15:47:18 +11:00
Jesse Boyd
fb729df59e
Setting to sort plots by area 2016-11-23 15:36:25 +11:00
MattBDev
e126054053 Fixes #1429 Removes duplicate aliases. 2016-11-20 22:29:14 -05:00
Jesse Boyd
e0208aa369
Fix plot help category pagination 2016-11-18 10:49:03 +11:00
Jesse Boyd
fdc42a3d5c
Seems the new spigot 1.11 sqlite driver has issues parsing timestamps, no idea why. 2016-11-18 09:08:41 +11:00
Jesse Boyd
2ec0b55482
Fix database lock error 2016-11-13 22:17:17 +11:00
Jesse Boyd
f8b1fcffa1
Fix worldedit mask area 2016-11-12 00:14:12 +11:00
Jesse Boyd
17762f5ae7
Tweak delete message 2016-11-09 00:13:46 +11:00
Jesse Boyd
c950b0021f
Notify inbox permission 2016-11-02 04:27:52 +11:00
Jesse Boyd
68011f43cd
Fixes #1390 2016-10-21 03:51:27 +11:00
Jesse Boyd
e594227d95
Fix some height issues 2016-10-14 16:56:28 +11:00
Jesse Boyd
d6be5703ae
Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-10-14 15:14:35 +11:00
Jesse Boyd
c97544d083
Minor fixes 2016-10-14 15:14:08 +11:00
MattBDev
a05fd2dd11 Fix #1386 
Signed-off-by: MattBDev <mattbdev@outlook.com>
 2016-10-10 00:18:35 -04:00
Jesse Boyd
5978c9c3c0
Fix center 2016-10-03 00:56:27 +11:00
Jesse Boyd
5d3e096501
*Fix the toggle 2016-10-03 00:56:26 +11:00
filoghost
cd33aaa1b6 Fix permission checks being ignored 2016-10-01 21:35:57 +02:00
Jesse Boyd
0244c0241c
Trim deletes expired plots 2016-10-01 20:17:50 +10:00
Jesse Boyd
c533f0bae9 Fix area removal 2016-09-30 17:05:18 +10:00
Jesse Boyd
499120963a Streamline PlotMe conversion 
Use reflection to disable PlotMe and forward DefaultGenerator to
PlotSquared
Fix border material copying from plotme config
You no longer need to delete the PlotMe jar for conversion
Fix some outdated messages
 2016-09-30 16:14:35 +10:00
Jesse Boyd
f1d581a8d8 Fixes #1377 2016-09-30 15:29:50 +10:00
Jesse Boyd
6074fc8033 Nukkit generator fixes 2016-09-30 14:26:20 +10:00
Jesse Boyd
e4d7270c28 Fix some merged plot events 2016-09-30 03:30:34 +10:00
Jesse Boyd
b6df07f723 Add snow-form flag 2016-09-27 01:38:59 +10:00
Jesse Boyd
6bf2fbcfcf Command tweaks 2016-09-26 18:33:27 +10:00
Jesse Boyd
12f8861d07 Various 
externalize strings
plotme conversion fixes
 2016-09-26 18:31:08 +10:00
Jesse Boyd
c99e23bd3c Fixes #1367 2016-09-25 18:48:38 +10:00
Jesse Boyd
1b6d08b3fe Fixes #1365 2016-09-25 18:43:53 +10:00
Jesse Boyd
3b4490c1c6 Fixes #1366 2016-09-25 18:42:05 +10:00
Jesse Boyd
04c011164a Add near cmd 2016-09-25 18:06:20 +10:00
Jesse Boyd
364b4347d1 Fix area id parsing 2016-09-19 14:18:47 +10:00
Jesse Boyd
d89274ce09 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
 2016-09-17 16:03:57 +10:00
Jesse Boyd
264114332b Let generator be up to the implementation 2016-09-17 16:02:05 +10:00
MattBDev
8e7e5dcb25 Cleanup 
Signed-off-by: MattBDev <mattbdev@outlook.com>
 2016-09-14 12:16:22 -04:00
Jesse Boyd
56227a6d7d Fixes #1351 2016-09-14 10:21:14 +10:00
Jesse Boyd
63259ec269 Merge pull request #1352 from MisterErwin/master 
A (possible) fix to #1351
 2016-09-14 10:17:11 +10:00
Jesse Boyd
0286a7b046 Fixes #1131 2016-09-14 10:12:53 +10:00
Alexander Lüpges/MisterErwin
bf1d487508 A (possible) fix to #1351 2016-09-12 17:05:13 +02:00
Jesse Boyd
a95b68b73c Add villager-interact flag 2016-09-09 15:17:37 +10:00
Jesse Boyd
85ff8bf639 Minor tweaks 2016-09-07 00:28:01 +10:00
Jesse Boyd
07ee19b4bb Fixes #1337 2016-08-31 19:09:17 +10:00
Jesse Boyd
da7a12bc00 Fixes #1234 2016-08-29 16:21:14 +10:00
Jesse Boyd
3b73b2e9d8 Fix grant check 2016-08-29 15:33:26 +10:00
Jesse Boyd
dd665ed9ce Fence rotation 2016-08-29 15:01:19 +10:00
Jesse Boyd
90d48b2cd0 Fixes #1289 2016-08-26 13:54:22 +10:00
Jesse Boyd
a95d18499e Fixes #1285 2016-08-26 13:19:42 +10:00
Jesse Boyd
a801127036 Merge pull request #1301 from MisterErwin/master 
Calling events when players are removed from plots & correct calling of Member & Trusted events
 2016-08-26 02:02:40 +10:00
Jesse Boyd
2806f8b20c Fixes #1307 2016-08-26 01:36:35 +10:00
Jesse Boyd
7d11147836 Add Lazzy "Offline -> Offline Lowercase" conversion 2016-08-20 21:40:54 +10:00
Jesse Boyd
bc0c0abe7e Fix NPE 2016-08-19 12:16:13 +10:00
Jesse Boyd
005e13a216 Maybe #1239 2016-08-17 18:30:58 +10:00
Jesse Boyd
3558105789 Fix default flags NPE 2016-08-17 15:08:01 +10:00
Jesse Boyd
f651607d2f Might work? 2016-08-17 12:22:45 +10:00
Jesse Boyd
30da060f83 Potential fix for schematic placement on clear 2016-08-16 15:53:26 +10:00
MattBDev
ef3380dc0a Merge remote-tracking branch 'origin/master' 2016-08-12 15:04:18 -04:00
MattBDev
749ab83e5d Move permission check out of loop 
See #1307
 2016-08-12 15:04:11 -04:00
Jesse Boyd
daea9cf60d Allow teleportation for console 2016-08-10 12:33:18 +10:00
Jesse Boyd
db69da5b07 *Wrong runnable 2016-08-09 08:52:31 +10: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
c8419f4a4a Added more Java 8 warnings 2016-07-29 21:40:23 -04:00
MattBDev
610e204d12 Fix #1281 , Fix #1282 , and Sponge gradle 2016-07-29 12:47:42 -04:00
MattBDev
b5ec6232f9 Sponge Fixes and minor changes. 2016-07-25 22:25:15 -04:00
MattBDev
48064da1ee Fixed deny-teleport flag 2016-07-25 22:25:15 -04:00
Jesse Boyd
0b19cc7d9d Possible fix + add guest-gamemode flag 2016-07-25 22:23:19 -04:00
Jesse Boyd
4e019ab796 UUID cache changes 2016-07-25 22:23:19 -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
8b084839fd Fix #1261 2016-07-19 10:22:50 -04:00
MattBDev
8538170cba Metrics 2016-07-16 22:51:49 -04:00
Jesse Boyd
76bce7c0ef Catch CommandException 2016-07-14 20:29:11 +10:00
Jesse Boyd
ba568a3f60 Recover from invalid flag value 2016-07-14 00:28:46 +10:00
Jesse Boyd
a43430b722 Fix NPE for null arg 2016-07-13 00:14:26 +10:00
Jesse Boyd
ca776b2912 Fixes #1226 2016-07-12 22:12:14 +10:00
Jesse Boyd
e859a7f56c Change to interact perm, not build 2016-07-11 20:27:25 +10:00
manuelgu
279084b043 Add additional alias for /p middle 
http://grammarist.com/spelling/center-centre/
 2016-07-09 09:18:55 +02:00
MattBDev
8b0e59209c Remove getServerName() 2016-07-05 23:43:08 -04:00
Jesse Boyd
b9ad75ad84 Add teleport flag 2016-06-29 21:22:55 +10:00
Jesse Boyd
185352d3cf Fixes #1229 2016-06-29 15:23:10 +10:00
Jesse Boyd
f4fe762135 * 2016-06-28 20:21:50 +10:00
Jesse Boyd
06682b18a5 Fix compile 
Recover on unknown command error
Fixes #1224
Close #1213 (fixed elsewhere)
Fixes #1212
 2016-06-28 19:55:51 +10:00
MattBDev
a579df00db Merge remote-tracking branch 'origin/master' 2016-06-27 10:14:28 -04:00
Jesse Boyd
29a0b68dcb Fix currently online for seen info. 2016-06-27 23:59:38 +10: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
047f9a75b9 Fix #1222 2016-06-27 17:45:19 +10:00
Jesse Boyd
f20ef15774 Revert creature spawn message + change expire to seen 2016-06-26 04:30:12 +10:00
MattBDev
3a973342ae Merge remote-tracking branch 'origin/master' 2016-06-24 10:59:18 -04:00
MattBDev
6e25aab51f Cleanup some docs. 2016-06-24 10:56:38 -04:00
Jesse Boyd
a49492aae3 Fix roadregen 2016-06-24 16:16:22 +10:00
Jesse Boyd
dbe965e901 init script engine on get 2016-06-24 15:41:34 +10:00
MattBDev
2c82d1106a Fixed kick message 2016-06-23 23:19:02 -04:00
MattBDev
5b9dc59abf Updates to docs, code style tweaks, and some code optimizations 2016-06-23 20:12:17 -04:00
Jesse Boyd
b587b430b8 #1211 2016-06-24 05:30:26 +10:00
Jesse Boyd
8fd2599686 Fixes #1211 2016-06-24 02:20:21 +10:00
Jesse Boyd
56000d60e7 Just in case 2016-06-23 13:14:29 +10:00
Jesse Boyd
1643399fc6 Alternatives for setowner none if the username is taken 2016-06-23 13:11:26 +10:00
Jesse Boyd
e6387419f7 Potential fix for plot biome (untested) 2016-06-23 13:09:56 +10:00
Jesse Boyd
16d191db2c Fixes /plot kick * 2016-06-23 04:08:06 +10:00
Jesse Boyd
7fb2631421 Cast to string if necessary 2016-06-21 14:23:04 +10:00
Jesse Boyd
718831e8e0 * 2016-06-21 14:10:20 +10:00
Jesse Boyd
df4585a847 Check args for grant 2016-06-21 13:38:08 +10:00
Jesse Boyd
88d8339cfd fix other NPE 2016-06-21 13:32:28 +10:00
Jesse Boyd
e08db3d12b Check teleportation on command location prefix 2016-06-21 03:02:41 +10:00
Jesse Boyd
2ff4e07919 Setup border on world creation 2016-06-21 01:13:09 +10:00
Jesse Boyd
f6fec56677 Potential fix for terrain 3 worlds. 2016-06-21 00:29:39 +10:00
Jesse Boyd
3fabfa10d7 Add liquid-flow flag 2016-06-20 22:48:04 +10:00
Jesse Boyd
a2ca9a52ea Merge pull request #1205 from manuelgu/fix/deadlink 
Remove dead link
 2016-06-20 18:52:35 +10:00
Jesse Boyd
e5e3600206 Why were these restricted to players? 2016-06-20 18:52:00 +10:00
manuelgu
7ad50b6314 Remove dead link 2016-06-20 10:49:40 +02:00
Jesse Boyd
01d508edf4 Fix remove * 2016-06-20 15:08:56 +10:00
Jesse Boyd
9fa28e1179 * 2016-06-20 01:50:43 +10:00
Jesse Boyd
c3dd28caeb Fix clear done flag requirements 2016-06-20 01:49:35 +10:00
Jesse Boyd
ce7468e63a Fix economy NPE 2016-06-20 00:52:05 +10:00
Jesse Boyd
3ce225c044 Bump version 2016-06-19 15:51:46 +10:00
Jesse Boyd
c2f10a7065 Update desc for debugpaste 2016-06-19 13:44:14 +10:00
Jesse Boyd
8512adf9d6 Fix for augmented 2016-06-19 13:01:30 +10:00
manuelgu
5eabf863d6 Fix #1196 2016-06-19 00:11:21 +02:00
Jesse Boyd
cff30a1db4 Fix scripting initialization 2016-06-18 16:29:51 +10:00
Jesse Boyd
ab51d27e49 Remove pointless thread dump 2016-06-18 15:01:42 +10:00
Jesse Boyd
6375922808 I can't count + fix variable scope 2016-06-18 13:54:35 +10:00
Jesse Boyd
29ce4af350 Fixes #987 and #299 (untested) 
Example usage:
claim: 50*{arg}
 2016-06-18 13:43:34 +10:00
Jesse Boyd
91c742c141 Fixes #590 2016-06-18 13:13:36 +10:00
Jesse Boyd
232091454a Fix augmented 2016-06-18 12:44:56 +10:00
Jesse Boyd
081081b36e Fixes #1063 2016-06-17 15:42:23 +10:00
Jesse Boyd
4319300b34 Fixes #1126 2016-06-17 13:46:13 +10:00
Jesse Boyd
b2b90a8d17 Fixes #1064 2016-06-17 13:33:47 +10:00
Jesse Boyd
480453b716 Various 
Fixes #1177
Additional check for left click with milk on adult entity
Add setting for enabling persistent meta
Only set fly persistent meta if it differs from the current gamemode fly
mode.
 2016-06-16 20:16:48 +10:00
Jesse Boyd
2bbfec1a32 Fix load / flush queue before sending message 2016-06-16 17:31:02 +10:00
Jesse Boyd
b2997b7c7b Don't send duplicate messages 2016-06-16 10:31:33 +10:00
Sauilitired
472aadcd01 Add suggestion for flags when invalid flag name was given :] 2016-06-16 02:30:16 +02:00
Sauilitired
5b103d49c0 Fixes #1171 2016-06-16 02:08:01 +02:00
MattBDev
ae5e15e434 Fix invalid record type error 2016-06-13 15:05:38 -04:00
Jesse Boyd
b238bdbd21 Fix armor stand / hangings being considered vehicles 2016-06-13 15:32:13 +10:00
Jesse Boyd
4f0ede646e Chat / Merge blocks placer / generator 2016-06-13 14:47:50 +10:00
Jesse Boyd
506455ae40 Remove debug 2016-06-12 15:33:56 +10:00
Jesse Boyd
6165469e76 Fix scripting 2016-06-12 15:26:58 +10:00
MattBDev
5bdb2263dc CheckStyle code tweaks 2016-06-10 14:04:55 -04:00
MattBDev
76bcb76905 Merge remote-tracking branch 'origin/master' 2016-06-10 13:31:41 -04:00
MattBDev
482f4d6815 Modify Setting and Storage class names. 2016-06-10 13:00:34 -04:00
Jesse Boyd
0d47e4599f Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-06-09 18:06:08 +10:00
Jesse Boyd
f41c7dc1f6 Fix NPE 2016-06-09 18:06:00 +10:00
MattBDev
12c01760a6 Tweaks and small memory improvement. 2016-06-06 01:43:06 -04:00
Jesse Boyd
880e084006 Register expiry tasks 2016-06-06 12:47:54 +10:00
Jesse Boyd
237a0d8b6b Always cache * uuid 2016-06-05 20:11:02 +10:00
Jesse Boyd
a1c722aa9e Fix player location/current plot 2016-06-05 20:03:05 +10:00
Jesse Boyd
960ad50070 Use DBFunc instead of dbManager 2016-06-05 19:54:33 +10:00
Jesse Boyd
7d44850bb0 Mask getBlock 2016-06-05 19:46:52 +10:00
Jesse Boyd
7427d83ae2 final primitives are final 2016-06-05 19:39:51 +10:00
Jesse Boyd
48cf381ed6 * 2016-06-05 18:57:11 +10:00
Jesse Boyd
0114dd7558 Fix convert 2016-06-05 18:42:34 +10:00
Jesse Boyd
48382e0c4e Remove null version from storage 2016-06-05 18:23:24 +10:00
Jesse Boyd
ce23ad5615 Fix NPE 2016-06-05 18:07:41 +10:00
Jesse Boyd
0b1153da21 Include other config files in DebugPaste 2016-06-05 17:43:40 +10:00
Jesse Boyd
386157edc1 fix reserved flags 2016-06-05 17:35:44 +10:00
Jesse Boyd
b7a8c8ecd6 Don't need this 2016-06-05 17:33:06 +10:00
Jesse Boyd
951a6b82a2 simplify config / multiple expiry tasks / block cache fix 2016-06-05 17:28:43 +10:00
MattBDev
70aaa984e2 Documentation and Flag Changes. 2016-06-04 17:19:37 -04:00
Alex
281f60a4ef Fixed invalid condition 2016-06-04 20:26:32 +02:00
Jesse Boyd
ca5d3a818b PlotBlock cache / events / flags 2016-06-04 06:20:13 +10:00
MattBDev
7dba332455 Debug a player is added to the known list. 2016-06-03 11:17:08 -04: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
8e306a92e3 Condense HttpUtil 2016-06-02 09:59:54 -04:00
MattBDev
f21d159911 Various fixes and tweaks. 2016-06-01 16:50:35 -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
Jesse Boyd
85055320c2 Merge pull request #1134 from manuelgu/feature/componentevent 
[WIP] Implement PlotComponentSetEvent
 2016-05-28 09:13:04 +10:00
manuelgu
d7b2881778 Don't * import 2016-05-28 01:12:05 +02:00
manuelgu
ec4839ec3f Move event calling to Plot class 2016-05-28 01:09:13 +02:00
Matt
604f62dbd3 Remove dumb log statement 2016-05-27 11:10:36 -04:00
MattBDev
6c40ed7718 Fix Titles 2016-05-27 10:54:06 -04:00
MattBDev
e615fb4c44 Merge remote-tracking branch 'origin/master' 2016-05-26 09:19:50 -04:00
MattBDev
cc2d99849b Optimizations and javadoc tweaks 2016-05-26 09:19:38 -04:00
manuelgu
ceb8fb9fa3 Implement PlotComponentSetEvent 2016-05-25 21:49:55 +02:00
Jesse Boyd
88ad051637 Direction/chance for bo3 2016-05-26 04:14:47 +10:00
MattBDev
465f7f4504 Tweaks and doc updates. 2016-05-24 22:08:45 -04:00
Jesse Boyd
83f664129f Fixes #1130 2016-05-23 17:27:40 +10:00
Jesse Boyd
7bdcde6d24 Why was this made private? 2016-05-23 04:12:11 +10:00
Jesse Boyd
89442a0e77 Fix visit 2016-05-22 07:13:59 +10:00
Jesse Boyd
b8afbe8a00 Optimize auto trim + command cost/confirmation 2016-05-22 05:29:27 +10:00
MattBDev
13b7a798e6 ignored exception 2016-05-21 11:54:00 -04:00
MattBDev
8af30667e4 ignored exception 2016-05-21 11:18:35 -04:00
MattBDev
4bd83ab298 Logger changes 2016-05-21 11:16:21 -04:00
Jesse Boyd
3ea2d06e70 Closes #1124 2016-05-22 01:11:27 +10:00
Jesse Boyd
4ceb54b566 Add logger 2016-05-22 00:47:14 +10:00
MattBDev
1768943360 Register flags 2016-05-20 20:29:16 -04:00
Jesse Boyd
82e162ae00 * 2016-05-20 03:29:51 +10:00
Jesse Boyd
5665e9b709 Fix merging sometimes not removing intersection 2016-05-20 03:25:45 +10:00
Jesse Boyd
6bad640cec Fixes #1037 2016-05-19 18:53:07 +10:00
Jesse Boyd
1df9ae77ab Fixes #1111 2016-05-19 18:13:37 +10:00
Jesse Boyd
1ece792e2b Create parent directory for bo3 2016-05-18 16:35:37 +10:00
MattBDev
1b9c92fd4a Fix #1067 2016-05-17 21:52:36 -04:00
Jesse Boyd
64f3e8f79b Fixes #1116 2016-05-15 01:54:12 +10:00
manuelgu
72096db8d6 Remove unused API Location that got printed on startup 2016-05-14 12:33:52 +02:00
manuelgu
a5a001130c Fetch latest vesion on command 
PS.get().update would return the URL of the latest update at the time
the server was started. Not everybody is restarting their servers daily
so it might end up in people not noticing an update in a long while
 2016-05-13 19:09:40 +02:00
manuelgu
c1bc3dfc29 Add HttpUtil utility class 2016-05-13 19:07:56 +02:00
manuelgu
7701e7f05f Beautify listing of plot areas 2016-05-13 19:05:50 +02:00
manuelgu
2c0743b7e9 Proper method name 2016-05-13 19:04:55 +02:00
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
MattBDev
1535c5e2f5 Fix test file 2016-05-05 13:41:11 -04:00
MattBDev
894524f998 Fix test file 2016-05-05 13:39:54 -04:00
MattBDev
8925c66b6e Fix file name 2016-05-05 13:19:15 -04:00
Matt
e4350feb2a Fixed missing type change 2016-05-05 13:17:17 -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
3e4dbe0fbf fix compile error 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
Matt
7d340b58b4 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-02-27 15:49:45 -05:00
Jesse Boyd
ce8775414a Fix some logic 2016-02-28 07:04:57 +11:00
Matt
5da8700f7f Force Core to use Java 7 2016-02-27 13:41:49 -05:00
Jesse Boyd
01710e3ddb Fixes 
Notify core of all world loading regardless of generator
Optimize plot area fetching
Fix plot delete not deleting the plot until restart
Fix plot unclaim not removing the owner on any cached plots
Change gradle output directory
Fix plotme conversion sometimes not copying over the floor/main blocks
 2016-02-27 21:07:42 +11:00
Jesse Boyd
f68042bc11 Fixes 
Fixes unlink failing if a parameter is provided
Fix plot unlinking not resetting the road biome
Fixes #888
 2016-02-27 16:05:21 +11:00
Jesse Boyd
c7870b617c Gradle / maven 
Fix archive names (includes project/module name + version)
Generate MD5 hash alongside jar
Improve build time
- asynchronous building
- enable daemon
- change scope of a few statements
- skip building of 3 jars
Add filtering to the plugin.yml (maven/gradle)
Bump version to 3.3.0 in pom
 2016-02-26 23:55:21 +11:00
Jesse Boyd
f921db937a Fix plot music duplication when moving between plots in a merged plot 2016-02-26 17:43:49 +11:00
Jesse Boyd
4669f31658 Fixes 
Fixes hybridplotworld rotation for stairs
Fixes hybridplotworld skipping non-rotatable blocks on swapped sideroad
schem
Fixes schematic generation using wrong height
Fixes debug spam printed when using download cmd
Fixes pagination having page number instead of total list items
Fixes plot area list page being off by 1
Remove compatibility for a spigot 1.8.0 bug where getting the world name
during initialization crashes the server.
Fixes type 1,2 plot worlds not being fetchable if there are more than 8
plot worlds loaded.
 2016-02-26 17:29:31 +11:00
Jesse Boyd
c8ddcd7f54 Fixes 
Fix plot cluster command NPE
Fix path iterator (for Plot.getAllCorners()) being off by 1
 2016-02-26 04:17:23 +11:00
Jesse Boyd
fb2e949711 Fix rotation for stairs metadata (range:8-15) 2016-02-26 01:21:30 +11:00
Jesse Boyd
7659884e73 Fixes 
Fixes #868
Fixes #778
Fixes attributes passing wrong key to persistent meta
Fixes blob compatibility with JDBC driver for persistent meta
Fix stackoverflow from countEntities under certain circumstances
Minor cleanup
 2016-02-26 01:17:07 +11:00
Jesse Boyd
efae2c2e63 Finished several core parts of the sponge port 
Mass block changes / chunk packet sending
AsyncWorldEdit (buggy)
Fixed world ground cover layers being generated
Fixed tab completion
Fixed plot title color
Fixed worlds unloading when no players are present
Fixed falling blocks not falling where they should
Fixed console color
Fixed chunk regeneration on full plot worlds
Other stuff
 2016-02-25 20:13:07 +11:00
Jesse Boyd
f73a542b04 Tab completion, fix SpongeUtil.getWorld 2016-02-24 05:12:07 +11:00
Matt
b69e31129d Updated Gradle 2016-02-22 23:11:40 -05:00