Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-06-30 16:24:43 +02:00
Code Issues Projects Releases Wiki Activity
596 Commits 6 Branches 11 Tags 8 MiB
39443a2ad3
Commit Graph

258 Commits

Author SHA1 Message Date
Phoenix616
583c50438c Revert "Fix merging of items that aren't actually equal. (Like skulls with textures)" 
This reverts commit 11d2280d3e.

The method isn't actually the issue and the workaround introduces new
issues.
 2017-02-20 00:39:30 +01:00
Phoenix616
11d2280d3e Fix merging of items that aren't actually equal. (Like skulls with textures) 2017-02-19 17:22:07 +01:00
Phoenix616
765548e0e5 Use Bukkit's addItem method if maxStackSize equals the item's natural stack size 2017-02-19 17:17:42 +01:00
Phoenix616
90f7dd5b0f No need to use the workaround anymore as CB adds large itemstacks properly now 2017-02-19 16:50:31 +01:00
Dan Mulloy
87071ca384 Merge branch 'master' into master 2017-01-16 13:53:21 -05:00
Eredrim
fc3c134c2a Update residence comptibility 2017-01-07 23:14:27 +01:00
Dan Mulloy
fa7a196bab Fix static access 2016-11-21 11:43:09 -05:00
L4BORG
2ff945bbe6 Fix Admin Shops 2016-11-10 03:17:27 +01:00
L4BORG
24eb1b1e19 Economy fixes, fix for https://github.com/dmulloy2/ChestShop-3/issues/11 2016-10-13 18:11:23 +02:00
Dan Mulloy
24df17fde2 Restore compatibility with 1.8 
Fixes #9
 2016-09-22 11:57:49 -04:00
Dan Mulloy
e186635484 Try to fix a few more errors 
Fixes #7
 2016-09-20 15:45:18 -04:00
Dan Mulloy
3fa939983b Merge branch 'master' of git+ssh://git@github.com/dmulloy2/ChestShop-3.git 2016-09-20 15:40:49 -04:00
Dan Mulloy
050ce61347 Try to fix (or just ignore) a weird null pointer 
Fixes #6
 2016-09-20 15:40:41 -04:00
mibby
58258c858f Re-add database suppression. 
Re-add database suppression for SQLite driver start-up log warnings.

https://dev.bukkit.org/bukkit-plugins/chestshop/tickets/1059-warning-you-seem-to-not-be-using-the-xerial-sqlite/
https://dev.bukkit.org/bukkit-plugins/chestshop/tickets/1086-error-com-acrobot-chest-shop-ormlite-db-sqlite-database/
 2016-08-27 20:20:46 -07:00
mibby
8c7594be51 Revert PlayerKick Behavior 
Partial revert of 'Do not let people with already used usernames connect to the server' commit. 

See comments here b0369d8e69 (commitcomment-14185778) and here. 
c169df2265 (commitcomment-12846919)

I personally believe ChestShops should not dictate whether a player is allowed to connect to the server or not. I personally have had issues with ChestShops kicking legitimate players from the server in online mode.
 2016-08-27 20:09:09 -07:00
mibby
17eb698e28 Move sign-update() to break listener 
This fixes an infinite loop crash where the sign update calls the piston event and the update again and again.
Also signs can't even be pushed by pistons...
 2016-08-27 19:58:45 -07:00
Dan Mulloy
5749c84c28 Fix and re-enable AuthMe hook 2016-08-20 16:17:10 -04:00
Dan Mulloy
02d18df559 Fix an error with empty signs 
Fixes #3
 2016-08-20 16:08:46 -04:00
Dan Mulloy
a13b2c9070 Fix a few NPE's caused by null accounts 
Thanks @mibby
 2016-07-07 12:15:43 -04:00
Dan Mulloy
a9f2f228d6 Update to 1.10, attempt fix for item overflow 2016-06-09 22:38:15 -04:00
Brian Ronald
ef5ccbb775 Implement missing methods so that this compiles without errors 2016-05-08 00:29:20 +01:00
Gabriele C
973ce58461 Fix authme hook 2016-04-05 22:23:50 +02:00
Dan Mulloy
123c05a98e Update to 1.9 2016-03-06 14:50:15 -05:00
Andrzej Pomirski
5f7d6776c2 kickPlayer() should be called asynchronously 2015-08-15 19:38:30 +02:00
Gabriele C.
1546461fa2 Update AuthMeChestShopListener.java 2015-08-07 15:18:21 +02:00
Gabriele C.
897127976a Merge pull request #1 from Acrobot/master 
Up
 2015-08-07 15:16:06 +02:00
Gabriele C.
656c1080ce Update AuthMeChestShopListener.java 2015-08-07 15:15:35 +02:00
Gabriele C
be26bea03c Moved AuthMe hook to ChestShop using the API 2015-08-06 15:59:51 +02:00
Andrzej Pomirski
b0369d8e69 Do not let people with already used usernames connect to the server 2015-08-06 15:19:46 +02:00
Gabriele C
27688735ad Readded suppress warning 2015-08-06 14:36:16 +02:00
Gabriele C
690af050e1 Style fix, removed useless cases 2015-08-06 14:33:15 +02:00
Gabriele C
8c49bfdbf4 Fixes 2015-08-01 09:52:13 +02:00
Andrzej Pomirski
c70fa03a6c Remove database suppression 2015-07-12 19:19:23 +02:00
Andrzej Pomirski
17c2f943c6 Do not let players create shops on donation chests 2015-07-12 19:18:53 +02:00
Andrzej Pomirski
3c949f0450 Remove trailing zeroes from prices 2015-07-12 19:18:31 +02:00
Andrzej Pomirski
1d550874fb Grammar! 2015-07-12 19:18:06 +02:00
Andrzej Pomirski
7bc452e203 Switch to thread-safe DTOs 2015-07-05 21:56:42 +02:00
Andrzej Pomirski
118f72e805 Speed up SignBreak 2015-07-05 21:55:59 +02:00
Andrzej Pomirski
e5953cd740 Speed up the isSign method 
Theoretically, block.getState() returns a thread-safe instance of a
block, so getting it when not needed might have hurt performance of
ChestShop
 2015-07-05 21:48:17 +02:00
Andrzej Pomirski
99959f2ca0 Fix the problem with colour signs 
Apparently sign colour plugins do not consider &0 to be a colour that
needs to be removed if there is no other code like that on the sign,
thus ChestShop did not register the initial SignChangeEvent, however
after the server software removes the redundant colour from the sign, it
appeared and worked just like a ChestShop one. This commit "fixes" this
by stripping the colour codes from the sign before it is created.
 2015-05-31 18:27:11 +02:00
Andrzej Pomirski
44d801db46 Remove obsolete configuration options 2015-05-22 13:31:43 +02:00
Andrzej Pomirski
6982ef38d1 Should fix the Mac issues 2015-05-22 13:26:42 +02:00
Andrzej Pomirski
2cde9da196 Remove DB logging 2015-05-22 13:26:28 +02:00
Andrzej Pomirski
cd3781c26c Should fix the lag, hopefully 2015-05-22 13:26:20 +02:00
Andrzej Pomirski
02673dec94 Make DB code nicer 2015-05-22 13:26:07 +02:00
Andrzej Pomirski
6466b2d6aa Remove logging to database! 2015-05-22 13:25:32 +02:00
Andrzej Pomirski
13d83ec92a Fix Essentials' Eco problem 2015-03-21 16:11:33 +01:00
Andrzej Pomirski
2c729789e8 Add a warning for Residence 2015-03-21 16:11:23 +01:00
Andrzej Pomirski
fac9a18b8f Add a simple shop edited event, not yet working 2015-03-17 11:36:55 +01:00
Andrzej Pomirski
cb126f22cf Fix the price exploit 2015-03-17 11:36:19 +01:00
Andrzej Pomirski
1bd0e9f8ef Change the priority of the discount handler 2015-03-11 18:02:41 +01:00
Andrzej Pomirski
28f9f08987 Fix money being transferred to the old username 2015-03-11 18:02:30 +01:00
Andrzej Pomirski
d25dbd5cce Migrate the database 2015-03-11 18:01:50 +01:00
Andrzej Pomirski
8c77057703 Fix the issue with name changes 2015-02-04 20:14:35 +01:00
Andrzej Pomirski
f975450130 Fix an issue caused by Spigot/CraftBukkit "forgetting" the usernames 
Somehow, OfflinePlayer initiated with an UUID does not contain the
"name" property after a while.
 2015-01-17 15:18:32 +01:00
Andrzej Pomirski
116d22dd62 Sign charge fees should go to the server account 2015-01-08 20:24:40 +01:00
Andrzej Pomirski
31003ca29f Add rounding option to tax getter 2015-01-08 20:12:53 +01:00
Andrzej Pomirski
f6aad7e397 Fix a problem with invalid item IDs 2015-01-08 20:12:38 +01:00
Andrzej Pomirski
a058b80990 Fix WordGuard + minor fixes 2014-11-30 20:15:27 +01:00
Andrzej Pomirski
a4fdc30e17 Add an additional "%buyer" tag to the out of stock message 2014-08-13 17:23:11 +02:00
Andrzej Pomirski
c646dd16a0 FOUND THE CULPRIT. 2014-08-13 17:22:52 +02:00
Andrzej Pomirski
bed883f7ae A small bugfix 2014-07-28 20:51:04 +02:00
Andrzej Pomirski
6bbfc93b27 Fix the "value already present" error 2014-07-22 22:03:50 +02:00
Andrzej Pomirski
be18af86f6 Prevent shops from being ignited 2014-07-13 12:54:30 +02:00
Andrzej Pomirski
d1a79425ed Automatically drop the username on leave 2014-07-03 18:49:12 +02:00
Andrzej Pomirski
1bbf293379 Fix nicknames 2014-06-29 22:22:28 +02:00
Andrzej Pomirski
e39825aa1f Update Residence 2014-06-29 17:35:49 +02:00
Andrzej Pomirski
2a89fb345b NameManager > Bukkit 2014-06-22 14:33:02 +02:00
Andrzej Pomirski
f6457e3d47 Add alternative fallbacks 2014-06-22 14:32:50 +02:00
Andrzej Pomirski
ddf32eda04 Add an option to not remove LWC protections 2014-06-22 14:32:40 +02:00
Andrzej Pomirski
9fa2f92ef8 Switch Vault from names to UUIDs 2014-06-14 20:46:59 +02:00
Andrzej Pomirski
404f7296e0 Remove Register - NO DEFAULT ECONOMY SUPPORT 2014-06-14 20:40:31 +02:00
Andrzej Pomirski
bdecaa1727 Add prefixes to commands 2014-05-24 11:50:27 +02:00
Andrzej Pomirski
a1a688c110 Update updater (yo dawg) 2014-05-24 11:38:13 +02:00
Andrzej Pomirski
83dbce40fd Add a warning if people try to run the new ChestShop version with an older CraftBukkit version 2014-05-24 11:37:51 +02:00
Andrzej Pomirski
4d5f568e1f Removed the admin shop message, since it is no longer necessary 2014-05-24 11:23:43 +02:00
Andrzej Pomirski
39213b2be1 Refactoring the latest /cstoggle changes 2014-05-24 11:15:54 +02:00
Faris Rehman
482ea412b2 Made usage for the command 2014-05-20 22:20:14 +01:00
Faris Rehman
4194a09c86 Fixed missing code 2014-05-20 22:18:51 +01:00
KingFaris10
dffbb7f06a Added /cstoggle to disable spam messages. 2014-05-20 22:13:25 +01:00
Andrzej Pomirski
bd0a40e16c Cache names in NameManager 2014-05-06 11:55:33 +02:00
Andrzej Pomirski
c403c1736f Fix the ? item recognition 2014-04-21 17:08:31 +02:00
Andrzej Pomirski
11ffd64952 Fix the version file not saving 2014-04-21 17:08:20 +02:00
Andrzej Pomirski
38279fade4 Do not download updates if you're using a dev version 2014-04-18 19:43:00 +02:00
Andrzej Pomirski
b4947475e2 Remove the "hacking" message. 2014-04-18 19:41:27 +02:00
Andrzej Pomirski
6d27ca7bea Remove the unnecessary database logging 2014-04-18 19:41:15 +02:00
Andrzej Pomirski
b05840dd98 Fix the updater not to download dev versions 2014-04-15 16:00:57 +02:00
Andrzej Pomirski
7842be5f75 Prepare for database migrations 2014-04-12 17:37:23 +02:00
Andrzej Pomirski
f193276372 Prevent from breaking signs for non-existant players 2014-04-12 17:27:16 +02:00
Andrzej Pomirski
e02a8bb92e Fix the name autocompletion 2014-04-12 17:16:13 +02:00
Andrzej Pomirski
554c0291b5 Add a fake Admin Shop account 2014-04-12 16:52:21 +02:00
Andrzej Pomirski
b37ae0fbc4 UUID changes 2014-04-12 14:22:34 +02:00
Andrzej Pomirski
4107b10f4b More UUID changes 2014-04-12 13:57:39 +02:00
Andrzej Pomirski
7321e6dc07 More UUID changes 2014-04-12 13:38:11 +02:00
Andrzej Pomirski
b508d08bba Refactoring 2014-04-12 13:28:37 +02:00
Andrzej Pomirski
786c140ebd More refactoring + UUID changes 2014-04-12 13:28:29 +02:00
Andrzej Pomirski
b0e452ed1d Refactoring 2014-04-12 13:28:13 +02:00
Andrzej Pomirski
012dd4568d Document the functions 2014-04-12 13:28:02 +02:00
Andrzej Pomirski
6845f6a0cb Change the name to be more appropriate 2014-04-12 13:27:49 +02:00
Andrzej Pomirski
0328374951 Clean up the imports 2014-04-11 17:37:53 +02:00