Commit Graph

10165 Commits

Author SHA1 Message Date
LCastr0
788326fe54 Tried with armorstands, still not working :( 2017-03-22 13:11:14 -03:00
Sam
1c620048ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-22 14:14:30 +00:00
LCastr0
9afa829f89 Created new gadget item for PPC 2017-03-21 15:56:05 -03:00
LCastr0
4cd25ad921 Merge branch 'update/aprilppc' into update/aprilchest 2017-03-20 19:23:33 -03:00
LCastr0
d55690f904 Changed colors 2017-03-20 19:22:50 -03:00
Sam
c4c7ebe1e6 Check for blocks already registering 2017-03-20 22:10:20 +00:00
LCastr0
8f7f52e222 Added lore and icon for Funeral Bouquet and corrected the price for spring items 2017-03-20 16:52:27 -03:00
LCastr0
33b933f465 Added lore and icon for Flower Power 2017-03-20 16:50:44 -03:00
LCastr0
540a0189b4 Added lore and icon for Flower Arrow 2017-03-20 16:49:20 -03:00
LCastr0
16f02d5bd4 Added killer bunny pet 2017-03-20 16:38:31 -03:00
LCastr0
5ad0bdcab1 Added Spring Arrow Trail, added Spring Death Effect, moved each gadget to it's own package, added Spring Double Jump 2017-03-20 16:33:21 -03:00
LCastr0
5d2681ec97 Fixed some issues with menus! 2017-03-20 16:33:20 -03:00
LCastr0
defece04a9 Fixed some issues changing Creature to Entity 2017-03-20 16:33:20 -03:00
LCastr0
df4d0b117b Possible fix for pet names not showing 2017-03-20 16:33:19 -03:00
LCastr0
f5a85f2a54 Spawns pet 2017-03-20 16:33:18 -03:00
LCastr0
13238eb4ad Added equipment pages 2017-03-20 16:32:34 -03:00
LCastr0
e297f844e6 Renamed classes 2017-03-20 16:32:34 -03:00
LCastr0
137220d58f Custom pets 2017-03-20 16:32:33 -03:00
LCastr0
afad64bec3 Fixed CME 2017-03-20 08:49:20 -03:00
LCastr0
75ad5b9d51 Flowers where player walks 2017-03-20 08:23:32 -03:00
cnr
441e2ab30f Disable 2x XP 2017-03-20 01:19:21 -05:00
Sam
95d919a654 Removed was werid disjointed code 2017-03-19 00:07:23 +00:00
Sam
05bd93cbdf Fixed Death Bomber achievement exploit 2017-03-19 00:01:11 +00:00
Sam
18538d918c And 2FA wow, this is why you skim read PRs 2017-03-18 23:51:13 +00:00
Sam
df8ed90138 Ops, forgot to enable reports. Eclipse is bad 2017-03-18 23:44:42 +00:00
Sam
2ca0d0ce14 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-18 23:36:11 +00:00
LCastr0
e1d9a568c9 Added flower as a hat 2017-03-18 00:49:12 -03:00
LCastr0
d8b68e4716 Multi colored circle 2017-03-17 20:01:48 -03:00
LCastr0
92f5214c91 Added spring halo particle 2017-03-17 19:39:41 -03:00
Sam
b1a1faacb1 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-17 17:03:55 +00:00
Sam
8e5a5695d5 Fix early game revive 2017-03-17 17:03:53 +00:00
cnr
b464cab213 Add former St Patricks cosmetic names as alternatives 2017-03-17 00:52:41 -05:00
samczsun
5349f53bfe Fix St Patricks Chest info 2017-03-17 00:50:14 -05:00
cnr
a0764443a8 Merge branch 'update/stpatrickscosmetics' into develop 2017-03-17 00:49:51 -05:00
samczsun
f6884fccd8 Change update protocol 2017-03-17 00:20:56 -05:00
samczsun
866b7bf63b Better help message 2017-03-17 00:20:56 -05:00
samczsun
a1bad6d07e QoL improvements 2017-03-17 00:20:55 -05:00
samczsun
e4cd809ce4 Teamspeak integration 2017-03-17 00:20:55 -05:00
LCastr0
561d4108c2 Merge branch 'develop' into update/stpatrickscosmetics 2017-03-16 22:52:07 -03:00
LCastr0
2070f7b347 Fixed lore for taunts 2017-03-16 20:09:51 -03:00
LCastr0
3303f89c02 Added St Patrick's Chest to titles trackers 2017-03-16 20:07:10 -03:00
LCastr0
e3974b9228 Fixed lores 2017-03-16 19:56:52 -03:00
cnr
d64f50b98e Don't combine require() and a method accessor 2017-03-16 01:13:54 -05:00
cnr
78b6846cf6 Add Titles to chests 2017-03-16 00:58:53 -05:00
samczsun
94009cd652 Final changes 2017-03-15 23:16:09 -05:00
samczsun
035f4637ba Tracks in chests! 2017-03-15 23:16:08 -05:00
samczsun
d1993465a6 Add to online player if they're online 2017-03-15 23:16:08 -05:00
samczsun
ca5b4386f3 Nevermind, make a new command 2017-03-15 23:16:08 -05:00
samczsun
1cb118d3e5 Allow force giving items 2017-03-15 23:16:08 -05:00
samczsun
db2feeac42 Reorganize tracks, add BotB track 2017-03-15 23:16:07 -05:00
cnr
e5d2ad34eb Merge branch 'update/stpatrickscosmetics' into develop 2017-03-15 23:15:10 -05:00
AlexTheCoder
572e461eb2 Remove stray debug text 2017-03-15 23:14:19 -05:00
AlexTheCoder
2dce455f93 Update Carl animation to use shards instead of coins 2017-03-15 23:14:19 -05:00
AlexTheCoder
2881071c74 Patch Carl reward animation not cleaning up and update the votifier server to use uuid as the key for the status repository 2017-03-15 23:14:18 -05:00
samczsun
4778d28be4 Allow overriding enabled team armor 2017-03-15 23:13:42 -05:00
Sam
15d691370d Configuration for bridges 2017-03-14 21:05:52 +00:00
Sam
b35a9582df Optimise PlayParticle 2017-03-14 17:07:36 +00:00
LCastr0
a3861d43c4 Fixes costume throwing items without complete set 2017-03-14 13:32:49 -03:00
Sam
dae2eea01a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-14 16:08:57 +00:00
Sam
c8a9cffcdf Edit the documentation for per player world borders 2017-03-14 16:08:31 +00:00
Sam
a49b19ee0c Removal of kit progression from bridges 2017-03-14 16:08:16 +00:00
Sam
1e43398875 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-14 15:53:27 +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
cnr
78a8e53d2e Re-enable 2FA for Gem Hunters 2017-03-14 00:41:11 -05:00
LCastr0
2b988a02d8 Fixed horse 2017-03-13 19:39:14 -03:00
Sam
654dddbf1b Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-13 22:02:07 +00:00
Sam
a231c0b031 Wooo finally! 2017-03-13 22:01:06 +00:00
LCastr0
c54cd066ef Merge branch 'develop' into update/stpatrickscosmetics 2017-03-12 20:54:48 -03:00
LCastr0
401738f19a Removed horse cooldown 2017-03-12 20:53:43 -03:00
Sam
7ab201f206 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-10 18:10:12 +00:00
cnr
3dc36449b5 Add 2x XP and open Gem Hunters beta
This is for spring break, and ends 3/19
2017-03-10 00:29:11 -06: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
AlexTheCoder
7ed485c7ca Lets turn up the heat on this chess match... 2017-03-09 01:07:30 -06:00
AlexTheCoder
9fdcce525b Make extreme prejudice a bit more sneaky 2017-03-09 01:07:30 -06:00
AlexTheCoder
b78ce421b5 Notify via redis when an extreme prejudice ban occurs 2017-03-09 01:07:30 -06:00
AlexTheCoder
1148283dff Implement targeted GWEN-based discrimination against certain ip addresses 2017-03-09 01:07:30 -06:00
samczsun
888761d15e Somehow missed Team Super Smash 2017-03-09 01:06:53 -06:00
samczsun
b5f026d4c0 Removem misleading comment 2017-03-09 01:06:53 -06:00
samczsun
a99cb6579d PC-814 2017-03-09 01:06:53 -06:00
samczsun
4be4fcb434 Fix Team Armor Addon (also PC-201) 2017-03-09 01:06:53 -06:00
AlexTheCoder
a069d7ab59 Remove unnecessary INNER JOIN in sql to load a home server id 2017-03-09 01:04:50 -06:00
AlexTheCoder
721dd5a29a Update SQL to follow table name standards, color channel names in Carl GUI, and fix item positions in GUI 2017-03-09 01:04:50 -06:00
AlexTheCoder
f2394da7dc Give RewardManager access to StatsManager 2017-03-09 01:04:50 -06:00
AlexTheCoder
a691d58840 Set up clans specific rewards for voting, daily bonus, and youtube clicks. Additionally, set up promotion for specific youtube channels in Carl. Finally, provide support for a differently-named creeper! 2017-03-09 01:04:50 -06:00
AlexTheCoder
7e70d02751 Properly award all values in BonusAmount wherever it is used for rewarding 2017-03-09 01:04:50 -06:00
AlexTheCoder
a4c875b4bd Refactor Clans gold to be set from Core 2017-03-09 01:04:50 -06:00
AlexTheCoder
9591485bb6 Re-implement voting with Gem rewards and start refactoring Carl gold rewards 2017-03-09 01:04:50 -06:00
Sam
b0b437ab4e Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-08 18:24:37 +00:00
Sam
a9b53c8608 Gem Hunters Phase 2 2017-03-08 12:51:16 +00:00
LCastr0
3469b890d4 Rainbow taunt now uses sides of player as locations 2017-03-07 21:51:06 -03:00
LCastr0
1ffac1dd31 Drop nuggets when removing chests 2017-03-06 18:09:42 -03:00
LCastr0
63b4dd1053 Support server stuff 2017-03-06 17:33:36 -03:00
LCastr0
ec5de0ef12 Merging issues 2017-03-06 17:10:29 -03:00
LCastr0
3cc304d99c Used correct item for the mount 2017-03-04 23:52:12 -03:00
LCastr0
3d76f04508 Fixed rainbow taunt lagging players 2017-03-04 16:08:55 -03:00
LCastr0
f9b66e28f4 Fixed taunts not being disabled correctly 2017-03-04 14:07:24 -03:00
LCastr0
85b5eee92f Fixed the rainbow taunt 2017-03-04 00:40:53 -03:00
LCastr0
d6605e973d Changed chest animation 2017-03-03 23:38:32 -03:00
LCastr0
4a496ea4c1 Added particle for when opening the chests 2017-03-03 22:34:21 -03:00
LCastr0
2b18d62f0f Added icons and lores
Added floor for the chest
Fixed little copy paste error in BuyChestButton
Reduced amount of gold in the costume
2017-03-03 21:50:16 -03:00
cnr
06a71946a0 Publish server status earlier during startup
Servers are allowed ten seconds to publish their status on startup by
ServerMonitor. NpcManager can consume most or all of that allotted time
on EU, so we need to initialize ServerStatusManager first.
2017-03-03 08:15:56 -06:00
Sam
4211682ca2 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-02 20:30:00 +00:00
LCastr0
28746c7873 St Patricks Chest 2017-03-02 15:50:56 -03:00
Sam
cfe2a07278 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-02 16:58:26 +00:00
Sam
811b27b478 Apply mount cooldowns when the horse despawns 2017-03-02 16:58:25 +00:00
samczsun
d072fc3c21 Direct upload 2017-03-01 23:58:20 -06:00
samczsun
a0e79d87a2 Allow ops to use minecraft commands 2017-03-01 23:58:20 -06:00
samczsun
b782f5ced9 Speed up generation 2017-03-01 23:58:20 -06:00
samczsun
f8dbbce106 Cleanup 2017-03-01 23:58:20 -06:00
samczsun
dedcd254b0 Clean up maps on local server 2017-03-01 23:58:20 -06:00
samczsun
9669e960a7 Autorotate maps 2017-03-01 23:58:20 -06:00
samczsun
3e8b23c6f4 Sentry Issue #223473496
Don't bother with failsafe if the game is null (i.e. beyond dead)

Steps to reproduce:
1) Quit server at just the right time
2017-03-01 23:54:02 -06:00
samczsun
b3cc9f29e2 Sentry Issue #223905084
Prevent NewsManager from updating news when none exists

Steps to reproduce:
1) Join the server while the server is starting up
2017-03-01 23:54:02 -06:00
samczsun
3f40432268 Sentry Issue #223474603
Handle null gun in Minestrike

Steps to reproduce:
1) Bring a player down to low health using a molotov
2) Kill them with a grenade
2017-03-01 23:54:02 -06:00
samczsun
9571db123d Sentry Issue #223483175
Fix badly implement Player check in PerkBoneRush

Steps to reproduce:
1) Pick Skeletal Horse
2) Bone rush on some mob (i.e. cows in swamp)
2017-03-01 23:54:02 -06:00
samczsun
7af7abd615 Sentry Issue #223589200
Fix PetManager trying to rename a pet when it doesn't exist

Steps to reproduce:
1) Somehow make MSSQL slow
2) Rename pet, and disable pet
2017-03-01 23:54:02 -06:00
samczsun
cb9ac1fc9f Sentry Issue #223481030
Prevent Fish Flurry from activating if no suitable blocks are found

Steps to reproduce:
1) Select squid on hyrule castle
2) Activate fish flurry while looking at middle of empty side of castle
2017-03-01 23:54:02 -06:00
samczsun
7e9211815f Sentry Issue #223481223, #223481117
Reverse check so RHS can be null

Steps to reproduce:
1) Pick Wither Skeleton in SSM
2) Throw wither image away from other player so it has no target
3) When it's standing still (i.e no target), have the other player punch
the image
2017-03-01 23:54:02 -06:00
samczsun
0725639852 Sentry Issue #223596821
Check if player has left before performing actions

Steps to reproduce:
1) Pick wolf in SSM
2) Hit someone
3) Quit immediately after
2017-03-01 23:54:02 -06:00
samczsun
2e23d59702 Sentry Issue #223489411
Check if fired projectile is a WitherSkull before casting

Steps to reproduce:
1) Go to Wither Assult
2) Fire enderpearl
2017-03-01 23:54:02 -06:00
samczsun
c4bb9a23d5 Sentry Issue #223492448
Check if Power Player data is loaded before acting on it

Steps to reproduce:
1) Join before server has started up
2017-03-01 23:54:02 -06:00
samczsun
ed25fe1341 Sentry Issue #224064210
Have BonusManager check if Carl is enabled before cleaning up items

Steps to reproduce:
Trigger SQLException in NPCManager so NPCs aren't loaded,
or temporarily remove Carl from npcs database
2017-03-01 23:54:02 -06:00
samczsun
4d3301da56 Sentry Issue #223476291
Check whether worlds are equal before performing distance checks

Steps to reproduce:
1) Open treasure on one account
2) Go to Mavericks World on another account, tp to coords of treasure
2017-03-01 23:54:02 -06:00
Sam
13ffcbbd9b Rewrite of logout npcs, lots of quests 2017-03-01 18:07:35 +00:00
LCastr0
ff6a3e915e Add Gold Pot Morph 2017-02-28 23:12:07 -06:00
Sam
0ca4b2041d Fix a CCE in MorphDinnerbone 2017-02-27 19:00:06 +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
7d5d5d5401 Re-enable 2fa 2017-02-25 15:47:24 +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
cnr
7de556e3d8 Allow plugins to choose a hub type when restarting
Clans Hubs will send to Clans Hubs, Clans will send to Clans Hubs, and
all other plugins will send to the normal Hub
2017-02-25 00:35:46 -06:00
cnr
9450c29e3e Allow ETERNAL into the beta 2017-02-25 00:31:12 -06:00
LCastr0
7201e0ec0d Added taunt to menu 2017-02-24 22:08:36 -03:00
LCastr0
d471ac112e Fixed rainbow taunt a bit 2017-02-24 22:08:04 -03:00
LCastr0
b2fd8ac748 Rainbow taunt 2017-02-24 22:06:18 -03: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
LCastr0
a32cb6ab2f Mount 2017-02-24 19:39:54 -03: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
cnr
fb70c93f91 Add beta whitelist miniplugin 2017-02-24 00:46:05 -06:00
samczsun
60d9bd5d21 Move api to config file 2017-02-24 00:46:04 -06:00
cnr
af8b5f6522 Add Mineplexer support for beta lobbies 2017-02-24 00:46:04 -06:00
cnr
9ece8c9959 Add beta whitelist miniplugin 2017-02-23 23:39:34 -06:00
Sam
eb6003a169 Final push 2017-02-24 01:06:05 +00:00
LCastr0
8088cef29f Leprechaun pet fixed 2017-02-23 20:12:11 -03:00
LCastr0
e731a91e40 Leprechaun pet 2017-02-23 17:35:50 -03:00
LCastr0
63cef754f6 St Patricks outfit 2017-02-23 14:57:52 -03:00
Sam
2b64de8ad1 Preparation for beta 2017-02-23 14:42:55 +00:00
samczsun
5b13a87500 Move api to config file 2017-02-22 23:32:56 -06:00
cnr
3d4e64a208 Add Mineplexer support for beta lobbies 2017-02-22 22:12:01 -06: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
Sam
77dfc2a7c7 No need for UtilServer 2017-02-18 10:37:40 +00:00
Sam
15395d1391 Fix item giving and animations going to the wrong player 2017-02-18 10:37:26 +00:00
Sam
af29135026 ItemFrames and Leaves 2017-02-18 10:37:03 +00:00
Sam
0fa0d88aac Clean up sewer mobs 2017-02-18 10:36:50 +00:00
Sam
074c786c35 Don't allow purchase if inv if full 2017-02-18 10:36:38 +00:00
Sam
4cb4f944e7 Fix the map not working when players relog 2017-02-18 10:36:23 +00:00
Sam
30d2059e9a Use MiniClientPlugin for gem tracking 2017-02-18 10:36:05 +00:00
Sam
14f33ba494 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-18 10:35:19 +00:00
cnr
b80a41ebe7 Reduce refresh rate of communities
Communities will only be refreshed if:
- We know (via redis message) that the community has been changed (e.g.,
  if a member joins/leaves, if an invite is sent, ...).
- Five minutes have passed since a full refresh
2017-02-18 01:31:53 -06:00
Sam
be2963cf79 More Sam Quotes 2017-02-17 19:41:48 +00:00
Sam
52bcd01e27 Remove give item cooldown 2017-02-17 19:04:16 +00:00
Sam
9db3ddc2d9 Remove debug message 2017-02-17 19:04:08 +00:00
Sam
5fbbae1493 The SamitoD quest 2017-02-17 18:55:38 +00:00
Sam
2657a98e70 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-17 18:16:36 +00:00
Sam
d56cd59df0 Quests and a whole host of wacky changes 2017-02-17 18:16:17 +00:00
Sam
cf36c83f4b Use Consumers instead of Callbacks 2017-02-16 14:15:56 +00:00
cnr
b8ac877fa3 Don't add US records twice 2017-02-16 02:55:29 -06:00
samczsun
01e83f0646 Final touches 2017-02-16 02:04:34 -06:00
samczsun
ecb42d91fe Fix bugs 2017-02-16 02:04:34 -06:00