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
2,507 Commits 232 Branches 71 Tags 86 MiB
d373a4dafa
Commit Graph

474 Commits

Author SHA1 Message Date
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