Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-11-13 22:05:15 +01:00
Code Issues Projects Releases Wiki Activity
630 Commits 6 Branches 11 Tags 7.2 MiB
5680b22345
Commit Graph

630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phoenix616
90a463abcd Add build number to version and fix authors in plugin.yml 2017-02-26 21:33:37 +01:00
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
5961c9f3df Update README.md 2017-01-16 13:56:39 -05:00
Dan Mulloy
5a39b6fd62 Merge pull request #47 from dmulloy2/master 
Merge changes from fork
 2017-01-16 13:55:24 -05:00
Dan Mulloy
87071ca384 Merge branch 'master' into master 2017-01-16 13:53:21 -05:00
Dan Mulloy
e44d9e9710 Merge pull request #17 from Eredrim/master 
Update residence comptibility
 2017-01-08 10:44:18 -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
Dan Mulloy
be96a17968 Merge branch 'master' of git+ssh://git@github.com/dmulloy2/ChestShop-3.git 2016-11-21 11:42:24 -05:00
Dan Mulloy
93c978ce02 Update to 1.11 2016-11-21 11:42:17 -05:00
Dan Mulloy
a79aa9d733 Merge pull request #14 from L4BORG/master 
Fix Admin Shops
 2016-11-10 16:21:25 -05:00
L4BORG
2ff945bbe6 Fix Admin Shops 2016-11-10 03:17:27 +01:00
Dan Mulloy
96699114c6 Merge pull request #12 from L4BORG/master 
Economy fixes, fix for https://github.com/dmulloy2/ChestShop-3/issues/11
 2016-11-06 21:58:38 -05: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
Dan Mulloy
35f18e947a Merge pull request #5 from mibby/master 
Few 'Quality of Life' improvements.
 2016-08-28 12:22:53 -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
e11b1430b4 Add download link to the readme 2016-08-27 12:44:39 -04:00
Dan Mulloy
8f962f9345 Fix heroes dependency 2016-08-26 20:36:35 -04:00
Dan Mulloy
f31e5b2602 Try to get it to compile 2016-08-26 20:19:02 -04: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
Andrzej Pomirski
6d6b6c9950 Merge pull request #46 from Libter/master 
Metrics update
 2016-07-20 15:09:31 +02:00
Libter
2169a3dc1c Metrics update 2016-07-19 14:41:44 +02: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
218e3b4acd Merge pull request #2 from VoxileRu/master 
Metrics R8
 2016-07-06 19:44:17 -04:00
Stanislav Usenkov
c4c879117a We should update Metrics! 2016-07-06 18:55:40 +06:00
Dan Mulloy
a9f2f228d6 Update to 1.10, attempt fix for item overflow 2016-06-09 22:38:15 -04:00
Dan Mulloy
bf2d3f6c78 Merge pull request #1 from Brianetta/PR_fix_compile 
Implement missing methods so that this compiles without errors
 2016-05-07 19:49:33 -04:00
Brian Ronald
ef5ccbb775 Implement missing methods so that this compiles without errors 2016-05-08 00:29:20 +01:00
Andrzej Pomirski
cfd8cff209 Merge pull request #44 from sgdc3/1.8.X 
Fix authme hook (final)
 2016-04-06 11:34:06 +02:00
Gabriele C
973ce58461 Fix authme hook 2016-04-05 22:23:50 +02:00
Gabriele C
b040eafcc1 Merge pull request #2 from Acrobot/master 
Up
 2016-04-05 22:07:39 +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
Andrzej Pomirski
c169df2265 Merge pull request #43 from sgdc3/master 
Moved AuthMe hook to ChestShop using the API
 2015-08-07 16:53:16 +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
532e50c64b Bump version 2015-08-06 16:10:26 +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