Commit Graph

463 Commits

Author SHA1 Message Date
Eric
7032209ef7 Use queue and move event for shop updater 2018-08-19 23:07:58 +02:00
Eric
c80129b56f Cancel 15 second timer after removing click type 2018-08-05 12:19:53 +02:00
Eric
f516b78776 Fix NPE when confirming buy or sell
Fixes #202
2018-08-05 11:54:52 +02:00
Eric
86322a1198 Fix warnings regarding PlotSquared flags 2018-08-03 18:56:09 +02:00
Eric
f40b0b7418 Use WorldGuardWrapper to support v7 and v6
https://github.com/CodeMC/WorldGuardWrapper
2018-08-03 18:24:09 +02:00
Eric
11c6af099b Fix ConcurrentModificationException 2018-08-03 18:19:45 +02:00
Eric
1e02539aab Don't allow WorldGuard access when sneaking
Sneaking doesn't open a shop chest anymore.
2018-08-01 16:17:24 +02:00
Eric
3678738048 Async shop creation (again)
This time, a thread pool with a maximum pool
size of 8 threads is used to execute the slow
methods of shop creation.
2018-08-01 13:37:07 +02:00
Eric
78384ebc7b Implement HikariCP for database 2018-08-01 12:20:10 +02:00
Eric
1a3641a377 Revert "Async shop creation"
This reverts commit 80626e823f.

It doesn't seem like a good idea to create 1000+ threads
(even if just for a minute)
2018-07-31 11:47:46 +02:00
Eric
80626e823f Async shop creation
This should fix timeouts when (re-)loading shops
2018-07-31 11:11:18 +02:00
Eric
16498424a8 Fix some NPEs for localizations 2018-07-30 17:52:32 +02:00
Eric
3cd655a2be Only have one ScriptEngine in HologramFormat class 2018-07-30 16:02:50 +02:00
Eric
5c2c3169b6 Change shop updater logic
I'm not sure if this better or worse, but it's worth a try.
2018-07-29 22:01:04 +02:00
Eric
0a06a69e65 Fix shops not being shown after re-join 2018-07-29 14:20:16 +02:00
Eric
09fef5b38c Remove database migration from old versions 2018-07-29 12:27:24 +02:00
Eric
b23040f7ce Update item_names.txt 2018-07-27 21:44:15 +02:00
Eric
baa67214b4 Fixed formatting for German translation 2018-07-27 21:44:14 +02:00
Eric
6ebffd020e Fix double chests for version <1.13 2018-07-27 21:44:13 +02:00
Eric
8ecc137835 Fixed command description (German and fallback) 2018-07-27 21:44:12 +02:00
Steven M
ff5c3cdd45 Fix books changing metadata by serialization (#165)
Fixes #164
2018-07-26 17:35:53 +02:00
Eric
148295ddb4 Don't check vendor balance at admin shops
Should fix errors with economy plugins when the vendor
does not have a valid name.
2018-07-26 17:25:55 +02:00
Eric
1a0920f239 Add product preview in shop info
This removes shop info messages for potion effect, enchantments,
music disc title and book generation.
2018-07-26 15:52:55 +02:00
Eric
8dd2a12375 Final updates for JsonBuilder 2018-07-26 15:48:25 +02:00
Eric
9a953f88f3 Fix item name for potions and some other items 2018-07-26 14:20:49 +02:00
Eric
3c0790d670 Make JsonBuilder.parse static 2018-07-26 13:44:44 +02:00
Eric
720fceaba1 Fix missing param in javadoc 2018-07-26 00:02:51 +02:00
Eric
9a70df5e01 Update JSON message builder/parser
Preparing for item preview in shop info
2018-07-26 00:02:06 +02:00
Eric
381de24362 Fixed formatting for update notification 2018-07-25 22:39:44 +02:00
Eric
4cb59b18de Re-add support for Minecraft 1.8 - 1.12.2 2018-07-25 16:54:22 +02:00
Eric
3d60b5b49c Replace deprecated AuthMe calls 2018-07-25 14:37:02 +02:00
Eric
8cf7b7c08e Fix javadoc warnings
A part of the documentation may still be incorrect
2018-07-25 13:11:44 +02:00
Eric
f51f91e8f4 Update maven pom file 2018-07-25 12:52:28 +02:00
Eric
1dbf68af9c Fix typos 2018-07-24 18:15:26 +02:00
Steven M
cfff0b9ce2 Implemented economy log cleanup (#156) 2018-07-24 18:10:04 +02:00
Eric
372124b04e FIx double chests when facing south or west 2018-07-23 21:32:42 +02:00
Eric
43bb3e3b38 Fix display issues and double chests 2018-07-23 21:12:43 +02:00
Eric
2ac81b0b8f Fix update checker 2018-07-23 19:50:27 +02:00
Eric
036d7f3bd2 Fix holograms 2018-07-23 19:31:42 +02:00
Eric
2d3edc7dcc Clean up some warnings 2018-07-23 18:38:37 +02:00
Eric
5a4741ddf3 Support Java 9+
Drops support for Java 7
2018-07-23 18:38:36 +02:00
Eric
94a51373b5 Support Minecraft 1.13
Drops support for older Minecraft verions (1.8 - 1.12.2)
2018-07-23 18:38:06 +02:00
Eric
d7f464da2f Re-add repository for AuthMe 2018-07-23 17:57:03 +02:00
Eric
780aabd2f9 Added VSCode folder to .gitignore 2018-07-23 17:57:02 +02:00
Eric
5bfb0a1a22 Renamed config variables 2018-07-23 17:57:01 +02:00
ken_kentan
47b23f126e Add permission check to a shop create func (#194) 2018-07-21 14:04:26 +02:00
EpicEric
57d204dda6
Fix AreaShop repository 2018-05-21 12:16:49 +02:00
Thijs Wiefferink
cf4d1716b8 Fix AreaShop integration for regions using capital characters in their name (#190)
* Use a system dependency for AuthMe (maven repository is down)

* Use maven repository for AreaShop instead of including the jar

https://jenkins.wiefferink.me hosts the maven repository of AreaShop, so it is better to use that

* Fix AreaShop integration for regions that use capital characters
2018-05-21 09:40:40 +02:00
Eric
3ae16b0c61 Instantly update hologram text after buying/selling 2017-08-15 12:53:15 +02:00
Eric
2340eb67e1 Added config option to confirm buying and selling
Closes #128
2017-08-15 12:44:03 +02:00