Commit Graph

198 Commits

Author SHA1 Message Date
Sam
8c821af9de Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-08 02:09:24 +01:00
cnr
7cc7769378 Send gem hunters players to normal hub upon cashout 2017-06-07 18:26:56 -05:00
Sam
a63399943d Leaderboards and UFO world event 2017-06-06 19:28:41 +01:00
Sam
4a91d2821b Achievements 2017-06-05 20:57:30 +01:00
Sam
674253c89a Gen Hunters Title 2017-06-03 14:53:33 +01:00
Sam
092c5db6b2 Merge remote-tracking branch 'refs/remotes/origin/update/gem-hunters-11-5' into update/gem-hunters 2017-06-02 20:10:51 +01:00
Sam
670e9db9d2 Add Region to the slack logging 2017-05-20 17:33:00 +01:00
Sam
474c2e78f2 Check to make user the player has the itemstack when cashing out 2017-05-20 17:32:44 +01:00
cnr
a50587a8de Merge commit 'b446a76' into develop
This contains changes originally planned for May 11th from the
update/gem-hunters-11-5 branch. The other changes in that branch will be
pushed at a later date.
2017-05-17 19:19:00 -06:00
Sam
c042af4a5a Buying -> Buy 2017-05-18 01:52:26 +01:00
Sam
d51cc4f56e Swap buying and selling 2017-05-18 01:23:41 +01:00
Sam
95b124e2f5 Fix Millionair and Middle Class causing players to be disconnected 2017-05-18 00:30:07 +01:00
Sam
81a869c264 Implement progression titles 2017-05-18 00:28:08 +01:00
Sam
9acfa361ad Add mosted valued player to the map 2017-05-17 19:21:19 +01:00
AlexTheCoder
3abcb441bf Properly take into account server regions 2017-05-15 18:10:06 -07:00
AlexTheCoder
b73958ec96 Fix several issues on Gem Hunters, including a duping attack vector resulting from combat logger inventory desync 2017-05-15 18:10:06 -07:00
Sam
5c968890d3 Just implement logging 2017-05-11 19:58:57 -07:00
Sam
b446a7640e Hours not seconds 2017-05-11 22:56:48 +01:00
Sam
d7e3c25027 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5 2017-05-11 22:55:31 +01:00
Sam
7df87a7d7e Lots of fixes 2017-05-11 22:55:30 +01:00
cnr
0f98637024 Disallow players from switching between Gem Hunters via party 2017-05-10 19:54:28 -07:00
Sam
1d4d56e792 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters-11-5 2017-05-10 19:27:14 +01:00
Sam
0fce5a9490 Emergency infinite shard fix 2017-05-09 19:49:25 -07:00
Sam
10b0f1e1ed Add an armour decay for offline players 2017-05-09 16:27:56 +01:00
Sam
26df99a4cf Don't spawn combat NPCs in the lobby 2017-05-09 16:27:43 +01:00
Sam
1fbeaa6ecd Add a random teleport npc in the safezones 2017-05-09 16:27:21 +01:00
Sam
9d3957cd54 Increase time after switching servers to kick player 2017-05-09 16:27:06 +01:00
cnr
b0407cfc51 Send players to normal hubs from Gem Hunters
This changes the behavior of both /hub and update restarts
2017-05-04 12:43:20 -07:00
cnr
e6c7aa469b Merge branch 'feature/gem-hunters-persistence' into develop 2017-05-03 22:03:29 -07:00
cnr
840b50d56a Disable beta whitelist for open beta 2017-05-03 22:02:02 -07:00
Sam
4a984f3c41 More fixes! 2017-05-03 22:05:10 +01:00
Sam
3a1fb3cb86 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-05-02 23:17:09 +01:00
Sam
6d8c65ed08 Lots of great fixes 2017-05-02 23:17:06 +01:00
Sam
82ebd28400 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-05-02 21:02:26 +01:00
LCastr0
030157fdb5 Fix constructors 2017-05-01 23:18:03 -03:00
LCastr0
a37cf3b1c5 Fixed pets and mounts not having any message when they are inside castle, fixed item despawning, stopped players from placing jukeboxes inside castle 2017-04-30 19:33:38 -03:00
LCastr0
d33aac9fd4 Fixed args 2017-04-27 16:34:35 -03:00
Sam
90d173551d Fix not lobby gem duping 2017-04-26 21:56:01 +01:00
LCastr0
19138eb501 Added castle stuff for hub 2017-04-26 01:12:43 -03:00
Sam
82db46c1e6 Displayname fix 2017-04-21 22:52:34 +01:00
Sam
f9c98ccf8c Fix persistence? 2017-04-21 20:05:43 +01:00
Sam
914de58dbc World Event bug fixes 2017-04-09 16:01:44 +01:00
Sam
4552fc2e9b Fix loot module NPE 2017-04-05 21:14:12 +01:00
Sam
b85214c7f0 Fix the "wooden pillar" bug with supply drops 2017-04-04 21:12:39 +01:00
Sam
9ad8e18175 More persistence senanagins 2017-04-03 20:16:03 +01:00
Sam
4c882ae4a8 Fix chat handling elsewhere 2017-04-01 02:11:11 -05:00
Sam
03d781ca70 It be April fools matey, walk yee plank 2017-04-01 02:11:11 -05:00
Sam
4947b01f93 Convert itemstacks to craftbukkit versions 2017-03-31 20:24:45 +01:00
Sam
7a5e8241aa Implement more elements of persistence 2017-03-29 16:27:26 +01:00
Sam
61147c1e38 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-03-28 20:43:22 +01:00
cnr
ebb596cdf4 Re-enable whitelist for Gem Hunters 2017-03-27 23:47:25 -05:00
Sam
4455509bc8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-03-25 14:03:35 +00:00
cnr
e3c4d89d9a Disable 'Light em up' quest 2017-03-23 23:17:01 -05:00
Sam
ca1b185ba2 Improve the persistence system 2017-03-23 19:18:16 +00:00
Sam
f56b940a73 Super rough and ready persistence 2017-03-18 23:33:30 +00:00
cnr
96a471fa4e Disable mounts 2017-03-14 01:30:06 -05:00
cnr
eeee0bb893 Temporarily disable Gem Hunters tutorial 2017-03-14 01:26:39 -05:00
Sam
a231c0b031 Wooo finally! 2017-03-13 22:01:06 +00:00
Sam
97cb5fe3ce Enable moderation module 2017-03-09 14:01:56 +00:00
Sam
105ab35bb6 Reset exp on death 2017-03-09 14:00:54 +00:00
Sam
a9b53c8608 Gem Hunters Phase 2 2017-03-08 12:51:16 +00:00
Sam
811b27b478 Apply mount cooldowns when the horse despawns 2017-03-02 16:58:25 +00:00
Sam
13ffcbbd9b Rewrite of logout npcs, lots of quests 2017-03-01 18:07:35 +00:00
Sam
9df5d3e746 Add /cashout and /map commands 2017-02-26 17:30:35 +00:00
Sam
7760404b4e Lots of world events! 2017-02-26 17:16:16 +00:00
Sam
d4bdc3e5d1 Fix flint and steel 2017-02-26 17:16:04 +00:00
Sam
275cadda9d Decrease the amount of sewer mobs 2017-02-26 17:14:53 +00:00
Sam
3a1fef6557 Increase supply drop timer and fix the "wood" block bug 2017-02-26 17:14:41 +00:00
Sam
2f08c031a4 Re-enable mounts 2017-02-26 17:14:21 +00:00
Sam
0f30c58fe7 Fix /supplydrop start when the name was more than one word 2017-02-26 17:14:10 +00:00
Sam
31efd50489 Add support for multiple world event markers 2017-02-26 17:13:35 +00:00
Sam
dc66a79ef7 Fix rank upgrades not working maybe? 2017-02-26 17:13:16 +00:00
Sam
e1165d1746 Add support for World Event loot 2017-02-26 17:13:00 +00:00
Sam
fc57b35534 /disguise and strict anticheat 2017-02-26 17:12:44 +00:00
Sam
badde2b058 Fix spectators being able to damage other players 2017-02-26 17:12:25 +00:00
Sam
76f587cff5 Disable damage manager and particles 2017-02-26 01:31:20 +00:00
Sam
54f9677d2a Make the world event marker rotate based on exact yaw 2017-02-25 15:46:06 +00:00
Sam
fafcc9eb1c Add support for durability in LootItem 2017-02-25 15:46:06 +00:00
cnr
699845d6d7 Merge branch 'feature/gem-hunters' into develop 2017-02-25 00:40:05 -06:00
Sam
605fcf90dd Stop players spawning near others when joining 2017-02-24 23:50:37 +00:00
Sam
02a2f98601 Allow flint and steel 2017-02-24 23:40:30 +00:00
Sam
9219e50a1c Don't spawn purple chests when there are less than 10 players 2017-02-24 23:05:07 +00:00
Sam
7be7b47395 Debug stuff 2017-02-24 22:11:27 +00:00
Sam
ce272a3288 Fix hunger is safezones for real this time 2017-02-24 22:11:17 +00:00
Sam
a7edc830e0 Fix cashout related problems with cashing out 2017-02-24 20:52:54 +00:00
Sam
43524465c7 Fix the damageToLevel bug 2017-02-24 20:51:40 +00:00
Sam
71964b7bca Fix the no eat bug inside safezones 2017-02-24 20:51:26 +00:00
Sam
2090d2202c Actually give people gadget items 2017-02-24 20:51:11 +00:00
Sam
295f626ec4 Actually remove gems when players join 2017-02-24 20:50:53 +00:00
cnr
76ef632e81 Reward gems and shards the correct way 2017-02-24 06:57:16 -06:00
cnr
3858421194 Fix combat NPC issues
- Cashed out players were treated as combat-logged players
- Player inventories were not cleared before returning items, resulting
  in duplicated items
- Players would be given the "locked slot" item
- Allow multiple stacks of the same type and amount
2017-02-24 06:57:15 -06:00
cnr
68f61bbb20 Send players to beta hubs; add 2fa and anticheat 2017-02-24 06:57:15 -06:00
cnr
162ab602b2 Rename GemHunters output jar 2017-02-24 06:57:15 -06:00
cnr
eed784da04 Add beta whitelist to GemHunters and remove missing debug references 2017-02-24 06:57:00 -06:00
Sam
eb6003a169 Final push 2017-02-24 01:06:05 +00:00
Sam
2b64de8ad1 Preparation for beta 2017-02-23 14:42:55 +00:00
Sam
bde899212f Allow other players to pickup quests 2017-02-21 12:36:48 +00:00
Sam
75f734c5e7 Fix where after many hours chests would stop spawning 2017-02-21 10:08:48 +00:00
Sam
1b2c384afe Mounts base 2017-02-21 09:56:08 +00:00
Sam
4fc991dd24 Add sewer mobs 2017-02-20 21:02:49 +00:00