Commit Graph

4855 Commits

Author SHA1 Message Date
Sarah
9bfa586f61 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 20:16:08 +02:00
Sarah
3c5f8bf72d add names to quests in the stats gui, add different reward colors, properly remove "next Page" and "Previous Page" buttons from stats page 2017-06-01 20:15:39 +02:00
Sam
66b89d6e64 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-01 13:01:48 +01:00
AlexTheCoder
03d9032f82 Add backend system for saving/loading clans mounts with varied stats and skins 2017-06-01 02:16:12 -04:00
Alexander Meech
01e7dc85dd Merge branch 'develop' into feature/quests 2017-05-31 22:21:24 -04:00
cnr
921aaea5bd Disable Toggle check from the plugin side until tomorrow 2017-05-31 21:16:58 -05:00
Sarah
d7731d330c Do some visual adjustments, add back button to quest stats menu, remove quest from buy bar after completion 2017-06-01 00:34:21 +02:00
Sarah
5c8e6d84b0 Add increment command, Questtrackers, change some visuals, allow Quests to have multiple required items 2017-05-31 21:51:04 +02:00
Sam
8a9e113389 Improvements to the targetting system 2017-05-31 17:09:08 +01:00
Sam
70eec9e38c Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-31 13:17:41 +01:00
Sam
edfadde239 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-31 13:05:13 +01:00
cnr
6e2d39035d Add Bob Ross morph to PPC for June 2017-05-30 22:50:41 -05:00
Graphica
a87685eae0 Change color selector and put colors in order 2017-05-30 22:49:30 -05:00
Graphica
9c48919e42 Reduce paint time down to 30 seconds 2017-05-30 22:49:30 -05:00
Graphica
6b2a99a881 Make quotes be activated with a shift click 2017-05-30 22:49:30 -05:00
Graphica
a61c4cd816 Fix holograms not following players in 1.9+ 2017-05-30 22:49:30 -05:00
Graphica
98929f043f Make brush types varied and colored in player hotbars 2017-05-30 22:49:30 -05:00
Graphica
7baf3bad30 Clean up Hologram class code 2017-05-30 22:49:30 -05:00
Graphica
2c6112347a Add Bob Ross Morph 2017-05-30 22:49:30 -05:00
AlexTheCoder
2fc423306b Add appropriate starter level for multi-tiered achievements with level names to fix incorrect array length 2017-05-29 22:49:23 -05:00
Sam
efdffa6272 Level reward system 2017-05-28 12:57:44 +01:00
Sam
8f2c84b842 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 16:46:20 +01:00
Sam
27d9233566 While we're at it, change the easter egg achievement requirement 2017-05-27 01:05:02 +01:00
Sam
e3f678d71d Bugs 2017-05-27 00:56:38 +01:00
Sam
36733e9918 Fix gametype imports 2017-05-26 18:37:35 +01:00
Sam
d70cd38049 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-26 18:34:23 +01:00
Sarah
b7ba532568 Add quest stats page, make rewards be able to be items as well, fix some quest trackers, fix spelling mistakes 2017-05-25 00:40:41 +02:00
Sam
a134c1da5c Sign off changes 2017-05-24 19:19:52 +01:00
Sam
9df9fb80da Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-22 22:59:46 +01:00
Sam
92604bf6ad Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-20 17:45:36 +01:00
Sam
1db7454e81 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-20 17:45:19 +01:00
cnr
85993053aa Fix circular Anticheat dependency 2017-05-19 23:40:56 -05:00
cnr
c60d357cfe Fix AntiHack quick-logout NPE 2017-05-19 14:53:40 -05:00
cnr
2a7fea5936 Fix Anticheat ban message 2017-05-17 19:38:39 -06:00
cnr
eec20cc620 Merge branch 'update/ssm' into develop 2017-05-17 19:22:59 -06:00
cnr
cc98f4fdd5 Disable banner service calls 2017-05-15 17:59:56 -07:00
cnr
9bc118dc41 Fix Anticheat ban lengths 2017-05-15 16:38:42 -07:00
Sam
f23e778d92 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-13 17:31:00 +01:00
Sam
b52bc80985 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-13 15:18:10 +01:00
Sam
c8f20f3df5 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-13 15:15:52 +01:00
Sam
5454c00163 Hub integration 2017-05-13 15:15:51 +01:00
AlexTheCoder
9cf5fda540 Update leaderboards system to use more malleable seasons system 2017-05-13 01:05:18 -04:00
Sam
ff07d38d00 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-12 23:04:47 +01:00
Sam
6ecbf85dc8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 22:22:01 +01:00
Sam
abb983ac04 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-12 17:34:55 +01:00
cnr
b18d36b361 Merge branch 'feature/castlesiege2.0' into develop 2017-05-11 20:29:46 -07:00
samczsun
7658046d62 Change messages 2017-05-11 19:29:32 -07:00
samczsun
1390ea1579 Implement triggers 2017-05-11 19:29:32 -07:00
samczsun
ecef2fe9db New messages/durations 2017-05-11 19:29:31 -07:00
samczsun
c8a1035591 Comped accounts 2017-05-11 19:29:31 -07:00
AlexTheCoder
7ad86c435c More nitpicks 2017-05-11 21:40:06 -04:00
AlexTheCoder
3023c64c35 Jon is actually OCD 2017-05-11 21:34:41 -04:00
AlexTheCoder
1e93ad0b1e Proper resource management for leaderboard statements 2017-05-11 21:18:05 -04:00
AlexTheCoder
a76572f6d7 Change table names and add date indexes based on Jon's request 2017-05-11 20:49:38 -04:00
AlexTheCoder
aa898d74da Fix incorrectly named tables in fetch query 2017-05-11 15:25:22 -04:00
Sarah
a07aa7abdc Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-05-11 20:57:04 +02:00
AlexTheCoder
5d1199634d Rewrite leaderboard backend (again) 2017-05-11 14:48:35 -04:00
Sarah
16e0f38dcf Menu Improvements and more Quest Trackers 2017-05-11 18:08:55 +02:00
cnr
85c06c11cd Merge branch 'update/mayitems' into develop 2017-05-10 19:55:11 -07:00
cnr
0f98637024 Disallow players from switching between Gem Hunters via party 2017-05-10 19:54:28 -07:00
LCastr0
ac0339fc59 Fixed sync with dragon and fixed guardian not showing 2017-05-10 21:20:23 -03:00
LCastr0
5fe5c613e5 Fixed win rooms again 2017-05-10 19:25:14 -03:00
LCastr0
3dbed769c9 Fix for win rooms 2017-05-10 17:27:17 -03:00
AlexTheCoder
b4c27307ba Further leaderboard repository tweaks 2017-05-10 04:40:14 -04:00
AlexTheCoder
f34a2946c4 Final leaderboard repository changes for Jon 2017-05-10 03:28:55 -04:00
AlexTheCoder
fa1cd00c22 Tidy up leaderboard repository class a bit 2017-05-10 02:56:00 -04:00
AlexTheCoder
adf6e35a1f Update leaderboard backend based on discussion with Jon 2017-05-10 02:49:21 -04:00
LCastr0
92eaf4f8d8 Merge branch 'develop' into update/mayitems 2017-05-09 23:31:43 -03:00
LCastr0
8bb638c969 Removed unused code 2017-05-09 23:30:52 -03:00
LCastr0
9018a3cc50 Fixed kit selectors 2017-05-09 23:30:24 -03:00
LCastr0
bcd60d325b Fixed win rooms 2017-05-09 23:06:49 -03:00
AlexTheCoder
d13610251f Rename Castle Siege 2.0 to Castle Assault and re-implement the old game 2017-05-08 17:05:30 -04:00
LCastr0
00981cf846 Fixed all ranks having all win effects 2017-05-08 14:56:33 -03:00
LCastr0
5c265cfd66 Lock to other ranks, unlock on join 2017-05-08 10:35:21 -03:00
AlexTheCoder
49aaaa5301 Leaderboard changes 2017-05-08 02:08:03 -04:00
AlexTheCoder
6ef7608f20 Fix incorrect repository method name 2017-05-08 01:24:52 -04:00
AlexTheCoder
b9fd597370 Replace old castle siege with new castle siege 2017-05-08 01:14:17 -04:00
AlexTheCoder
68205a71a1 Implement proper stat leaderboard system 2017-05-08 00:08:36 -04:00
AlexTheCoder
941310b5aa Change kit prices 2017-05-08 00:07:42 -04:00
LCastr0
8604eb2e09 Teleport the creeper so it's visible 2017-05-06 22:54:24 -03:00
LCastr0
dc77dde98b Use correct slot 2017-05-06 21:29:41 -03:00
LCastr0
8befa61b8a Set force on creature module before spawning entities 2017-05-06 21:29:15 -03:00
LCastr0
8e58b974f3 Add line 2017-05-06 21:18:36 -03:00
LCastr0
c5b62e0ec4 Add all the win-effects to the page 2017-05-06 20:42:53 -03:00
Sam
23d924f137 Kit system 2017-05-06 20:51:49 +01:00
AlexTheCoder
a47c4291c5 Update tiered achievement UI 2017-05-05 22:06:18 -04:00
Sarah
f2c5268df1 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-05-05 23:02:30 +02:00
Sarah
20281648c2 Add Quest triggers, add a Repository, add Spreadsheet parsing, and add menus. 2017-05-05 23:02:15 +02:00
Kenny
ad79245252 Merge branch 'feature/quest-manager-service' into feature/quests 2017-05-05 15:25:33 -04:00
Kenny
54858e14ee Convert questmanager to read quests from google sheets 2017-05-05 15:22:37 -04:00
AlexTheCoder
00d31ffad3 Fix item builder to properly use null item titles 2017-05-04 23:20:50 -04:00
AlexTheCoder
901fecb49a Support multi named tiers of achievements, allow rewarding of xp/gems/crowns upon increasing achievement tiers, and replace old castle siege achievements with new ones 2017-05-04 23:20:50 -04:00
AlexTheCoder
43739743bf Add new castle siege game types to Core 2017-05-04 23:20:50 -04:00
AlexTheCoder
6684e812d1 Implement xp-less and crown kit upgrading and slightly modify kit progression gui 2017-05-04 23:20:50 -04:00
AlexTheCoder
39f997faf1 Give ProgressiveKits the ability to not use xp or use crowns instead of gems for leveling 2017-05-04 23:20:50 -04:00
AlexTheCoder
6ffd10133e Implement a new crown currency 2017-05-04 23:20:50 -04:00
AlexTheCoder
f9f2e362c4 Make ItemBuilder properly clone all options and implement a builder to create enchanted books 2017-05-04 23:20:50 -04:00
Sam
f6cb654e12 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-04 20:20:59 +01:00
Sam
8f01015df9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-04 17:35:41 +01:00
Sam
ee0971443e Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-04 17:32:16 +01:00
Sam
47c816087e MOBA base 2017-05-04 15:45:04 +01:00
LCastr0
f23016df28 Change to blaze powder 2017-05-03 23:59:16 -03:00
LCastr0
58078ae4bd Added kit selectors to chests 2017-05-03 23:42:18 -03:00
LCastr0
b3f46ad4fc Added names, icons and lores 2017-05-03 23:30:16 -03:00
LCastr0
196e0b9688 Reduce the amount of lines in the Shimmering Ring 2017-05-03 22:29:06 -03:00
LCastr0
229c888498 Reduce amount of particles spawned with the water wings 2017-05-03 22:27:38 -03:00
LCastr0
cf56dfb9cf Increase amount of smoke particles 2017-05-03 22:22:16 -03:00
LCastr0
ddd196ba0c Revert temporary folder for schematics 2017-05-03 22:08:31 -03:00
LCastr0
bbfa632106 Add all the mechanics to the win effects 2017-05-03 22:05:54 -03:00
Sam
bd52e63dc3 More alien stuff 2017-05-03 20:48:19 +01:00
Sam
10258d66b8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-02 23:18:38 +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
LCastr0
4e56d2133b Merge branch 'develop' into update/mayitems 2017-05-02 19:13:43 -03:00
Sam
82ebd28400 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-05-02 21:02:26 +01:00
Sam
034837030d Initial commit 2017-05-02 21:01:17 +01:00
Sarah
8d32c35f88 Add basic Quest system 2017-05-02 18:57:20 +02:00
LCastr0
923f991df3 Merge branch 'develop' into update/kingppc 2017-05-02 00:09:19 -03:00
LCastr0
b8d2f784c7 Fix NPE, actually call PetSpawnEvent when spawning a pet 2017-05-01 22:19:50 -03:00
LCastr0
8f117e744e More stuff in ultra effect 2017-05-01 22:14:46 -03:00
LCastr0
e7c171749c Set pitch and yaw for npc 2017-05-01 12:25:03 -03:00
Sam
6d4a68acdf Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-01 10:41:49 +01:00
Sam
8c2b8935df Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-01 10:37:13 +01:00
cnr
e2b43bb995 Don't show holograms in non-lobby servers 2017-05-01 00:49:25 -07:00
cnr
d62006a426 Add King item to PPC rewards 2017-05-01 00:45:24 -07:00
LCastr0
fc5c420176 Changed to update event 2017-04-30 21:19:02 -03:00
LCastr0
734aa920bf Fixed jukebox message 2017-04-30 20:00:29 -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
e3521c06fd This shouldn't be there... 2017-04-30 19:14:27 -03:00
LCastr0
5d3dbbb44b Checks for the correct world 2017-04-30 19:06:44 -03:00
LCastr0
9e0424ea46 Checks if it's hub before doing event related stuff 2017-04-30 19:00:53 -03:00
LCastr0
d205d5fada Fixed item being despawned, fixed holograms not being updated, fixed king never being removed on leave 2017-04-30 18:56:37 -03:00
LCastr0
8ec6ebd060 Fix particles being sent to everyone 2017-04-30 18:42:16 -03:00
LCastr0
04c0c63390 Fix positions 2017-04-30 18:26:02 -03:00
LCastr0
d88f183726 Fixed bug with gadgets and kings not being updated 2017-04-30 17:52:36 -03:00
LCastr0
d04e29a473 Tests 2017-04-30 14:46:15 -03:00
LCastr0
0b2d0d348c Merge branch 'develop' into update/mayitems 2017-04-30 13:38:26 -03:00
LCastr0
49fd8d3941 Fixed item and king not resetting after disabling 2017-04-30 12:52:00 -03:00
LCastr0
91fb50cc8b Fixed conflicts 2017-04-30 12:05:04 -03:00
LCastr0
28a5a438f5 Fix item being thrown from the throne 2017-04-30 12:02:00 -03:00
LCastr0
95e4170cc1 Added creeper 2017-04-30 11:47:57 -03:00
LCastr0
08150b2c0f Added rank-based win effects 2017-04-30 11:28:40 -03:00
cnr
6ae6f7b627 Revert "Rate limit book/sign edits as a temporary measure against a crash exploit"
This reverts commit f5cba1eb1e.
2017-04-30 01:54:43 -07:00
Sarah
dda09d51e5 Fix Commit 2017-04-30 01:38:04 -07:00
Sarah
a0c00e86c4 Implement LoggedCommand into Event Commands 2017-04-30 01:38:04 -07:00
Sarah
8a33eabe3d Add a way to log commands 2017-04-30 01:38:04 -07:00
Sarah
fdee6b1163 Add some more event commands, fix some existing event commands and change permissions for event related commands to be executeable by EVENT_MODERATOR 2017-04-30 01:38:04 -07:00
Sam
ee8f970673 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-29 23:40:16 +01:00
LCastr0
e6852d92f2 Fixed item, spawn particles even if player is moving 2017-04-29 13:24:27 -03:00
Kenny
f5cba1eb1e Rate limit book/sign edits as a temporary measure against a crash exploit 2017-04-29 02:05:07 -04:00
LCastr0
1879a92261 Changed to items... 2017-04-29 01:03:30 -03:00
LCastr0
146274001f Fix height (again) 2017-04-28 22:32:40 -03:00
LCastr0
25adf3fa33 Fix height 2017-04-28 22:04:00 -03:00
LCastr0
0a1a5eae7a Changed arrow to armor stand 2017-04-28 21:37:39 -03:00
LCastr0
f8566437d5 Fixed shimmering rings 2017-04-28 21:23:19 -03:00
LCastr0
df563793c5 Fixed name 2017-04-28 13:25:10 -03:00
LCastr0
adef8945a4 Disable other gadgets before enabling 2017-04-28 13:20:25 -03:00
LCastr0
c1f06595bb Fix NPE 2017-04-28 13:17:00 -03:00
LCastr0
1b686a1446 Shimmering Ring kit selector 2017-04-28 11:43:13 -03:00
LCastr0
89f47d4c6c Rain Cloud selector 2017-04-28 11:20:27 -03:00
LCastr0
42e4564a25 Rainbow Dance selector 2017-04-28 11:14:22 -03:00
LCastr0
e9d1ac85f1 Changed single-type particle to an enum, added love particles 2017-04-28 01:46:26 -03:00
LCastr0
ae8b348264 Ember Kit selector 2017-04-28 01:37:27 -03:00
LCastr0
1000c190a2 Fixed Y offset for Water Wings and added Flames of Fury and Halo effects 2017-04-28 00:32:29 -03:00
LCastr0
494fd4787c Skip disabling kit selectors between game restarts 2017-04-27 23:53:37 -03:00
LCastr0
073bc2eea7 Update hologram when player claims peasant 2017-04-27 21:18:12 -03:00
LCastr0
55f85966c1 Fixed arrow location 2017-04-27 21:17:05 -03:00
LCastr0
99363d9af5 Lore 2017-04-27 21:06:35 -03:00
LCastr0
16e9263874 Lets the player sit on the throne 2017-04-27 21:05:03 -03:00
LCastr0
d62d9a813b Javadocs 2017-04-27 20:55:21 -03:00
LCastr0
601c9e31c6 Updated hologram to display the amount of peasants in the kingdom 2017-04-27 20:54:49 -03:00
LCastr0
f1670bc550 Increase the height of the crown 2017-04-27 20:33:31 -03:00
LCastr0
e7c270847b Fixed message, and no longer updates without needing 2017-04-27 20:32:46 -03:00
LCastr0
e45e3be4e8 Added first kit selector 2017-04-27 20:01:29 -03:00
LCastr0
2615cd6add Fixed locations 2017-04-27 16:56:06 -03:00
LCastr0
246c0c1788 Added wools to the top of the castle 2017-04-27 16:28:09 -03:00
LCastr0
6a8cecad27 Javadocs 2017-04-27 15:43:55 -03:00
LCastr0
0942942f5a Changed messages 2017-04-27 15:43:31 -03:00
LCastr0
2e476226fd Javadocs for CastleManager 2017-04-27 15:16:34 -03:00
LCastr0
02785d5dfd Moved everything to CastleManager, changed to rightclick 2017-04-27 15:12:33 -03:00
LCastr0
124d22ce31 Added new class for peasants 2017-04-26 22:52:40 -03:00
LCastr0
4dfd1b3d21 Check for active gadgets while playing the particle 2017-04-26 16:22:24 -03:00
LCastr0
5764a4bce3 Added gadget class 2017-04-26 14:34:41 -03:00
LCastr0
01076ec054 Kit selector, not rank selector... 2017-04-26 14:10:49 -03:00
LCastr0
1855cfc4ed Added new gadget type 2017-04-26 13:58:30 -03:00
LCastr0
25487ad0b1 Fix message prefix 2017-04-26 11:17:03 -03:00
LCastr0
fb03e9adec Respawn holograms since setText doesn't work, and actually send the correct information to the event 2017-04-26 11:14:43 -03:00
LCastr0
56f19ec937 Null checker 2017-04-26 01:39:26 -03:00
LCastr0
6145d9f87d Lower the hologram a bit 2017-04-26 01:35:11 -03:00
LCastr0
9796b5acba Actually check if its a hub and start the hologram 2017-04-26 01:26:01 -03:00
LCastr0
19138eb501 Added castle stuff for hub 2017-04-26 01:12:43 -03:00
LCastr0
12f7659195 Added king particle 2017-04-25 00:16:32 -03:00
Sam
9d48a5f1a5 Creeper converted to Google Sheets 2017-04-23 16:08:45 +01:00
Sam
ac3c1c3ebb Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-21 17:42:46 +01:00
Sam
ca6789d92a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-21 17:35:12 +01:00
Sam
01f74a3e12 SSM Training Ground 2017-04-21 17:35:10 +01:00
cnr
ffdbebf3ee Prevent players from purchasing St Patricks Chests 2017-04-19 22:32:21 -07:00
cnr
6bf6725616 Commit missed conflict resolution 2017-04-18 01:40:09 -07:00
LCastr0
61409d0bfe Possible fix for duplicated items in some chests 2017-04-18 01:37:27 -07:00
cnr
dad00171a7 Clean up 'banwave' logic 2017-04-16 00:49:12 -06:00
LCastr0
09dc7edaad Added Spring chest to title trackers 2017-04-14 22:34:50 -06:00
cnr
c7e855ee16 Merge branch 'feature/eastereggs' into develop 2017-04-13 22:56:41 -06:00
cnr
7e7ac95ccb Change Skyfall stats icon to diamond boots 2017-04-13 20:47:19 -06:00
cnr
732d2cbeb8 Bump VL bounds for KillAura type A 2017-04-13 18:03:08 -06:00
cnr
8cbf8e8f1e Bump lower bound for Reach VL 2017-04-13 14:41:38 -06:00
cnr
ff3dbe5d93 Add missing AutoSneak ban 2017-04-13 13:30:53 -06:00
cnr
4e82233871 Make no-op thresholds a true no-op 2017-04-13 02:42:35 -06:00
cnr
5c5a368ebe Only register HeadRoll action once 2017-04-13 01:19:30 -06:00
Kenny
ac7492152a Fix average TPS reporting 2017-04-13 01:16:57 -06:00
samczsun
498df70a1f Implement basic canDamage 2017-04-13 00:02:32 -06:00
cnr
0735b415cf Implement new MineplexLink methods 2017-04-13 00:00:17 -06:00
cnr
490fe56b34 Merge branch 'update/skyfall-nolag' into develop 2017-04-12 23:39:01 -06:00
cnr
87f9fe6093 Implement anticheat VL and banwave changes 2017-04-12 23:36:55 -06:00
cnr
0dae58a0a7 Bump anticheat dependency version 2017-04-12 23:18:44 -06:00
cnr
da5df8dae2 Merge remote-tracking branch 'update/aprilchest' into develop 2017-04-12 23:03:47 -06:00
Kenny
cd7948c039 Report server TPS average to ServerMonitor rather than what it happens to be at that moment
This (should) fix instances of servermonitor flagging a server as lagging and killing it for short bursts of high CPU usage
2017-04-12 23:02:13 -06:00
AlexTheCoder
fe1cda820f Merge branch 'update/aprilchest' of github.com:Mineplex-LLC/Minecraft-PC into feature/eastereggs 2017-04-12 16:00:37 -04:00
AlexTheCoder
f3e6c44d9b Fix a bunch of bugs and switch to a block based egg hunt. Additionally, move some location constants to match the Easter Lobby. 2017-04-11 22:24:50 -04:00
LCastr0
1904990f84 Fixed merging issues 2017-04-11 23:16:42 -03:00
LCastr0
b511546b36 Removed age lock from zombie 2017-04-11 22:44:56 -03:00
AlexTheCoder
9a58cd792e Implement easter egg baskets in games which can give fantastic rewards 2017-04-11 20:18:09 -04:00
LCastr0
0a51bcd607 Easter, not eater 2017-04-11 16:10:59 -03:00
LCastr0
de46f2db70 Should have been added in the last commit 2017-04-08 23:09:10 -03:00
LCastr0
6f1c062182 Removed GameType, using GameDisplay instead 2017-04-08 23:06:55 -03:00
LCastr0
1f0a22eb94 Stops balloons from 'growing up' 2017-04-08 22:58:14 -03:00
LCastr0
e4fc53d5ce Removed flower trail from games 2017-04-07 17:46:53 -03:00
LCastr0
8bcb5bc948 Added event to be called when game stops 2017-04-07 14:13:53 -03:00
LCastr0
30215aea40 Added docs 2017-04-07 14:08:12 -03:00
LCastr0
6a668004e0 Added game start event to core, to be called inside arcade and handled inside core 2017-04-07 14:06:44 -03:00
LCastr0
45e3223962 Added effects to chets opening and changed flowers to leaves so they don't drop any items when removed 2017-04-07 14:02:30 -03:00
samczsun
daaea03be7 Strict username validation 2017-04-06 15:21:56 -04:00
Sam
5c00ca712f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-06 18:20:41 +01:00
Sam
f14bde9d30 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-06 11:56:59 +01:00
samczsun
be1e454d5c PC-696 2017-04-06 00:35:49 -05:00
samczsun
bd1d73d390 PC-1181 2017-04-06 00:35:49 -05:00
samczsun
4553a7081f PC-697 PC-1180 2017-04-06 00:35:49 -05:00
samczsun
40860ef9a2 PC-1107 2017-04-06 00:34:34 -05:00
samczsun
422bbcce2c PC-1025 2017-04-06 00:34:34 -05:00
samczsun
a97ba5d1fd PC-941 2017-04-06 00:34:34 -05:00
samczsun
4f77413523 PC-265 2017-04-06 00:34:34 -05:00
LCastr0
888c26c12d Changed icon of bunny pet 2017-04-05 19:03:12 -03:00
Sarah
e4b79a3731 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
2017-04-05 04:21:14 +02:00
LCastr0
27d7226712 Fixed flowers dropping after chest is opened 2017-04-04 22:58:43 -03:00
LCastr0
cb5b0a3c83 Changed the icon of the death effect 2017-04-04 18:00:47 -03:00
LCastr0
2c09bb584a Fixed Spring Set lore 2017-04-04 17:33:02 -03:00
LCastr0
424e0fe0a4 Fixed spring chests being purchasable even if locked or if player had all the items 2017-04-04 17:29:45 -03:00
LCastr0
957004f97a Added 'Found in X' lore 2017-04-04 17:28:11 -03:00
LCastr0
83d141eddc Changed price of Spring Halo particle 2017-04-04 17:25:16 -03:00
LCastr0
a7be020c9d Locked rabbit as adult 2017-04-04 17:23:43 -03:00
LCastr0
3bc4125b76 Removed custom pet from this update 2017-04-04 15:47:02 -03:00
Sam
b86ad77e0b Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-02 12:53:40 +01:00
Sam
bc1050e387 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-02 12:48:35 +01:00
cnr
6534561893 Disable April Fools manager 2017-04-01 23:59:47 -05:00
samczsun
ef21106da0 Fix memory leak in CompassModule 2017-04-01 16:20:59 -05:00
Sam
e71bab8cea Use a better DB schema 2017-04-01 02:11:11 -05:00
Sam
da29654807 April Fools Treasure Hunt 2017-04-01 02:11:11 -05:00
Sam
bd841762d1 Run skin getting on the main thread 2017-04-01 02:11:11 -05:00
Sam
016860b615 Replace NPCs with Pirates 2017-04-01 02:11:11 -05:00
Sam
4053e43964 Add a manual toggle 2017-04-01 02:11:11 -05:00
Sam
4b22355348 Add more fun stuff 2017-04-01 02:11:11 -05:00
Sam
52323f6119 Add more replacement words 2017-04-01 02:11:11 -05:00
Sam
e74486c1bc Add even more priate speak 2017-04-01 02:11:11 -05:00
Sam
4c882ae4a8 Fix chat handling elsewhere 2017-04-01 02:11:11 -05:00
Sam
66cea341a5 Use regex and remove "g" 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
cnr
850b7b1aad Merge remote-tracking branch 'update/aprilppc' into develop 2017-03-31 00:50:55 -05:00
Alexander Meech
10a1f71558 Add RustyDawgT to featured creators 2017-03-31 00:50:14 -05:00
LCastr0
ed39d5daa7 Reverted rename 2017-03-31 01:16:30 -03:00
LCastr0
911d5d20d2 Reverted rename 2017-03-31 01:07:00 -03:00
LCastr0
e8d6c321cd Merge branch 'develop' into update/aprilppc 2017-03-31 00:40:38 -03:00
samczsun
4d32efe779 Not even disguises are safe from the NSA 2017-03-29 23:31:12 -05:00
samczsun
c8eab2596f Move package because intellij is complaining 2017-03-29 23:31:12 -05:00
samczsun
affb2cb91f PC-1395
Don't disable self otherwise a message is shown
2017-03-29 23:30:49 -05:00
samczsun
017d737e59 PC-1248 PC-1249 2017-03-29 23:30:49 -05:00
samczsun
52f09655e8 PC-1231 2017-03-29 23:30:49 -05:00
samczsun
63eed1abcd PC-1210 2017-03-29 23:30:49 -05:00
samczsun
cb33bc7bed PC-1187 2017-03-29 23:30:49 -05:00
samczsun
fc686ea497 PC-1182 2017-03-29 23:30:49 -05:00
samczsun
40648cf715 PC-1178 2017-03-29 23:30:49 -05:00
samczsun
23c52eed2c PC-729 2017-03-29 23:30:49 -05:00
samczsun
3b8bda9dbd PC-728 2017-03-29 23:30:49 -05:00
samczsun
99534e19c5 PC-599 2017-03-29 23:30:49 -05:00
samczsun
9256fe9903 PC-401 2017-03-29 23:30:49 -05:00
samczsun
26d3a77748 PC-368 2017-03-29 23:30:49 -05:00
samczsun
4f3cfaba43 PC-163 PC-200
Reset a player's spectator target when they switch servers
2017-03-29 23:30:49 -05:00
LCastr0
fec8a42fd7 Merge branch 'update/aprilchest' of https://github.com/Mineplex-LLC/Minecraft-PC into update/aprilchest 2017-03-28 17:29:05 -03:00
LCastr0
88db9c2913 Added Bugs Bunny to spring chest 2017-03-28 17:26:50 -03:00
Sam
61147c1e38 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-03-28 20:43:22 +01:00
Lucas de Castro Queiroz
60a688b5ac Merge branch 'develop' into update/aprilchest 2017-03-28 11:55:14 -03:00
cnr
e3eac8b3ec Enable 2FA for support 2017-03-27 23:37:45 -05:00
LCastr0
ae2768d354 Changed name, lore, icon and cooldown 2017-03-27 23:58:01 -03:00
LCastr0
8da2431415 Added bugs bunny quotes 2017-03-27 22:39:50 -03:00
LCastr0
cb5a63974e Changed name of the item in PPC rewards 2017-03-27 20:21:46 -03:00
LCastr0
4f0110b942 Updated offset of the wings 2017-03-27 20:19:54 -03:00
LCastr0
235288af56 Changed wing shape again 2017-03-27 17:35:05 -03:00
LCastr0
3c241c48bc Changed rabbit morph to spawn holograms 2017-03-27 17:26:18 -03:00
LCastr0
32bb2515f7 Changed height of skeleton 2017-03-26 01:26:43 -03:00
LCastr0
9ee6960038 Added bee wings 2017-03-26 01:25:08 -03:00
LCastr0
3837d9fbda This should have been added in the last commit... 2017-03-25 18:38:43 -03:00
LCastr0
bff837ca9b Fixed morph and possible fix for balloons, added lore and icon for particle effect 2017-03-25 18:36:12 -03:00
Sam
4455509bc8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-03-25 14:03:35 +00:00
LCastr0
6875287b6d Changed pets to Entities instead of Creatures 2017-03-24 16:52:37 -03:00
LCastr0
5464a74d2c Added spring chest 2017-03-24 14:17:15 -03:00
LCastr0
d2851b0708 Merge branch 'develop' into update/aprilchest 2017-03-24 14:01:15 -03:00
LCastr0
64ed3e2e1b Still trying with armor stands... 2017-03-24 13:45:36 -03:00
cnr
d95ed8d749 Disable /link and /unlink help messages 2017-03-23 23:22:33 -05:00
AlexTheCoder
3b2c50efa3 Remove magic values for PPC tag id and linked tag id 2017-03-23 23:18:29 -05:00
AlexTheCoder
1ff033de43 Refactor website link to use consumers instead of callbacks 2017-03-23 23:18:29 -05:00
AlexTheCoder
f6fdc1f817 Implement a method for administrators to remove the link between an in-game minecraft account and a forum account, and rewrite synchronization of tags to more effectively handle the intricacies of the API being utilized 2017-03-23 23:18:29 -05:00
AlexTheCoder
3ebfb453c5 Implement rank and powerplay linking to the website and give specific ranks an id corresponding to their respective forum tag 2017-03-23 23:18:29 -05:00
cnr
9c504064c1 Force all players to reappear after win room 2017-03-22 22:41:08 -05:00
LCastr0
3b48a7caaf Update armorstand to make it never fall 2017-03-22 16:55:49 -03:00
LCastr0
49bc6b8663 Removed gravity 2017-03-22 14:42:11 -03:00
LCastr0
47b88b7734 Added Spring set, added awkward bunny morph, added items to menus 2017-03-22 14:37:42 -03:00
LCastr0
788326fe54 Tried with armorstands, still not working :( 2017-03-22 13:11:14 -03: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
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
Sarah
f8f7c04f58 Improve Performance, add dynamic rot rate, change some loot and islands only rot on the top 2017-03-20 19:18:33 +01: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
Sam
afe516e10c Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-03-18 23:33:34 +00:00
Sam
f56b940a73 Super rough and ready persistence 2017-03-18 23:33:30 +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
cnr
b464cab213 Add former St Patricks cosmetic names as alternatives 2017-03-17 00:52:41 -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
LCastr0
a3861d43c4 Fixes costume throwing items without complete set 2017-03-14 13:32:49 -03: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
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
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
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
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
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
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
samczsun
a0e79d87a2 Allow ops to use minecraft commands 2017-03-01 23:58:20 -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
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
7d5d5d5401 Re-enable 2fa 2017-02-25 15:47:24 +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
LCastr0
a32cb6ab2f Mount 2017-02-24 19:39:54 -03:00
Sam
7be7b47395 Debug stuff 2017-02-24 22:11:27 +00:00
cnr
68f61bbb20 Send players to beta hubs; add 2fa and anticheat 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
9ece8c9959 Add beta whitelist miniplugin 2017-02-23 23:39:34 -06: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
Sam
1b2c384afe Mounts base 2017-02-21 09:56:08 +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
2657a98e70 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-17 18:16:36 +00: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
samczsun
e7dbe48937 Block morph rewrite 2017-02-16 02:04:34 -06:00
LCastr0
0befc7d967 Fixed issue with gadget command re-enabling after running 2017-02-16 02:04:02 -06:00
samczsun
81f38cf06b Give trainees find 2017-02-16 02:03:25 -06:00
samczsun
7e18989fb7 PC-267 PC-545 PC-1253
This is to fix a troublesome race condition occurring between Mineplexer
and Core. Simply put, the following steps occur normally:

1) Player logs in via Bungee
2) If there is no PlayerInfo entry, PlayerStats inserts a PlayerInfo entry
into Redis
3) CoreClientManager looks for the PlayerInfo entry and finds it
4) If the PlayerInfo entry was just inserted, it will have accountId=0.
CoreClientManager sees this and updates it to a valid accountId, then
reinserts into Redis
5) All is good

However, sometimes Step 3 occurs before Step 2 (perhaps latency to Redis
is a factor), and so CoreClientManager
sees a null entry and ignores it. Then, an invalid PlayerInfo entry is
inserted with accountId=0, which then breaks any SQL queries relying on an
valid accountId
2017-02-16 02:03:25 -06:00
samczsun
cd387284bf Ignore armorstands for fleshhook/snowball 2017-02-16 02:03:25 -06:00
Sam
a879a1dc80 Item Map added 2017-02-13 18:18:32 +00:00
Sam
3a4e973551 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-12 13:12:53 +00:00
Sam
16773521b9 Lots of fixes 2017-02-11 17:18:39 +00:00
AlexTheCoder
11791bc461 Block joining clans servers via friends, block joining of clans servers that are restarting, clean up log mob armor stands on restart, take staff out of observer mode on restart 2017-02-09 22:44:30 -06:00
samczsun
5e5b607fc8 Fix my goof 2017-02-09 22:44:00 -06:00
cnr
181f360f11 Merge branch 'update/cosmetics-valentines' into develop 2017-02-08 22:32:35 -06:00
LCastr0
06cc8a06c1 Added lore for cupid pet 2017-02-08 21:56:49 -02:00
LCastr0
452a128b2b Added win room to love chest 2017-02-08 21:54:41 -02:00
LCastr0
22f6f243aa Fixed hover effect
Fixed love chest lore being purple
2017-02-08 15:44:05 -02:00
LCastr0
5902e82d58 Added message if blow a kiss doesn't hit anyone
Changed the lore for the taunt
Changed the display item and lore for the love chest
2017-02-08 15:17:04 -02:00
LCastr0
5dcf028a37 Fixed win room being unlocked by default 2017-02-06 23:52:15 -02:00
samczsun
1c96196359 Various changes for network security 2017-02-04 23:14:52 -05:00
samczsun
f4a9253505 Remove pending bans on instant ban 2017-02-04 20:42:49 -05:00
LCastr0
511bfdecd7 Added lores and icons 2017-02-03 18:45:00 -02:00
Sam
6cc5a14073 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-03 20:33:54 +00:00
LCastr0
adb3386899 Added tracker for love chest 2017-02-03 18:32:29 -02:00
LCastr0
9669f626a1 Fixed issue with chest pages not turning to page 2 2017-02-03 18:31:32 -02:00
LCastr0
9024bb6569 Added custom floor for Love chest 2017-02-02 12:28:10 -02:00
samczsun
8a3b531a06 Bawk Bawk Battles rewrite 2017-02-02 00:31:58 -06:00
md_5
7dc4c6b5b9 Compile fixes for OpenJDK-9
* Upgrade maven-jar-plugin to be compatible
* Remove unused / incompatible imports from PlayerInputActionMenu
2017-02-02 00:14:02 -06:00
LCastr0
d06c445e9c Reduced amount of particles from love train mount 2017-02-01 11:38:13 -02:00
LCastr0
ea8a4d2786 Reduced amount of particles from love doctor morph 2017-02-01 11:37:11 -02:00
LCastr0
048272ef59 Removed heart particles from love wings 2017-02-01 11:36:12 -02:00
LCastr0
4a42ed42bd Reduced amount of particles in love chest spawning 2017-02-01 11:35:31 -02:00
LCastr0
c0065ae696 Blow a kiss blowing kiss to yourself 2017-02-01 11:33:17 -02:00
LCastr0
c442c820f5 Disabled purchasing love chest with all the items unlocked 2017-02-01 11:29:50 -02:00
LCastr0
b5130181a2 Merging errors 2017-02-01 11:25:47 -02:00
Sam
c6bb850bc3 Lots of stuff 2017-01-30 23:28:55 +00:00
LCastr0
0ce741a5fb Small wings for cupid pet 2017-01-28 21:38:14 -02:00
LCastr0
2cfd51e38e Heart shaped wings 2017-01-27 17:40:35 -02:00
Sam
7200572583 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-26 20:10:48 +00:00
LCastr0
dd9f6e938d Added small butterfly wings 2017-01-26 09:56:21 -02:00
cnr
b2d17f2680 Merge branch 'update/true-love-pet' into develop 2017-01-25 21:11:56 -06:00
cnr
70948b6967 Refactor PowerPlayClubItem instead of using an event 2017-01-25 21:10:32 -06:00
cnr
20efc234fa Allow YT to use /disguise 2017-01-25 20:33:25 -06:00
Sam
692fcbacbb Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-24 17:18:29 +00:00
LCastr0
340f629f09 Changed knockback in winroom 2017-01-21 20:13:19 -02:00
LCastr0
9876c0c61c Changed particles for wings 2017-01-21 19:58:59 -02:00
Sam
4c38a5878f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-21 14:28:57 +00:00
Sam
3557fd8acc Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-21 14:21:03 +00:00
LCastr0
023ed5ed4a Small fixes for win room 2017-01-20 22:12:01 -02:00
cnr
8ae74ce952 Increase 2FA window size 2017-01-20 15:42:21 -06:00
cnr
fbb1836eb5 Change Brawl fountain goal to 35M gems 2017-01-20 14:30:54 -06:00
Sam
a16acedb14 Google Sheets v2 finally 2017-01-20 20:08:24 +00:00
cnr
4bb51a3734 Fix non-[\x00-\x7F] characters breaking chat 2017-01-20 01:27:59 -06:00
samczsun
7c829f8712 Filter duplicates, handle permissions in multicommand, support more commands 2017-01-20 01:27:59 -06:00
samczsun
8b1fe8302e Match Bukkit tab completion behaviour 2017-01-20 01:27:58 -06:00
samczsun
c340e48daa Fix Amplifier NPCs disappearing
Melon Launchers could be used to shove armor stands around. This has been
disabled
2017-01-20 01:27:58 -06:00
cnr
8fdbe87d1d Allow spaces when checking 2FA codes 2017-01-20 01:27:58 -06:00
cnr
fded8a6583 Change 2FA issuer on the test network 2017-01-20 01:27:58 -06:00
cnr
f23f04fdb1 Fix NPE in getOrLoadClient 2017-01-20 01:14:03 -06:00
cnr
8f72f9d087 Only require 2FA for MAPDEV+ 2017-01-20 01:14:03 -06:00
samczsun
66af3cc450 Fix parties mute bypass 2017-01-19 23:12:23 -05:00
LCastr0
34bf89187d Added win room to gadget manager 2017-01-19 21:44:57 -02:00
LCastr0
d2c7e48903 Started on the battlefield win room 2017-01-19 21:17:17 -02:00
LCastr0
a6ab41fe3f Fixed cupid pet 2017-01-19 21:14:15 -02:00
Sam
8a9a3cb2ac Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-19 21:16:12 +00:00
Sam
36c0c56f27 World Events and Sheets rewrite 2017-01-19 21:15:06 +00:00
LCastr0
2fd0e72439 Changed type of love wings 2017-01-19 04:56:11 -02:00
LCastr0
da36276bc3 Changed permissions for unlockcosmetics command 2017-01-19 00:50:42 -06:00
LCastr0
6180162476 Now only remove on teleport if its void 2017-01-19 00:50:42 -06:00
LCastr0
704c787008 Fixed lava and void issues again, prevents CME 2017-01-19 00:50:42 -06:00
LCastr0
d7fe81184a Better message when despawning balloons 2017-01-19 00:50:42 -06:00
LCastr0
0d1f3a0613 Fixed balloons dying on void
Fixed balloons bug near lava
Fixed balloons lore in menu
2017-01-19 00:50:42 -06:00
LCastr0
7f22872dd6 Changed OpenBalloons so it actually opens the balloons menu 2017-01-19 00:50:42 -06:00
LCastr0
a1a0271cd9 Added balloons to gadgets 2017-01-19 00:50:42 -06:00
LCastr0
9cba2aa9fc Removed disabled balloons from chests 2017-01-19 00:50:42 -06:00
LCastr0
03aa049f40 Added balloons to chests 2017-01-19 00:50:42 -06:00
cnr
e3b56eda2a Add 2FA reset command 2017-01-19 00:15:17 -06:00
cnr
9831c7259a Enforce 2FA and re-enable unbans for trainee+ 2017-01-18 23:47:47 -06:00
samczsun
fd65f2df1b Tab completion for /game set 2017-01-18 23:34:57 -06:00
samczsun
6692432c42 Smart™ Tab Completion©® 2017-01-18 23:30:39 -06:00
samczsun
e5ece844cb Tab completion 2017-01-18 23:20:56 -06:00
samczsun
c5d5d86c1d Use CoreClient instead of Player in case the player quits 2017-01-18 23:20:24 -06:00
samczsun
ac63985419 Revert removing strict anticheat 2017-01-18 23:20:24 -06:00
samczsun
cdc4f3debd Don't try to reload client if already loaded 2017-01-18 23:20:24 -06:00
samczsun
8e5483e42b PC-190
Ignoring listened on too high of a priority and chat managers didn't
respect the recipients list. Those two issues have been fixed in this
commit
2017-01-18 23:20:24 -06:00
samczsun
d856736bf4 PC-1301
If a player joins before any of our listeners are registered, they'll have
an account id of -1. If they manage to also not have a redis entry, their
cached id will also be -1. This breaks stuff. Instead, let's just kick
them.

Note that I'm not sending them using Portal because Portal is slow and I
want them off the server immediately
2017-01-18 23:20:24 -06:00
LCastr0
ed8363e1be Added items to infused chests 2017-01-18 20:57:54 -02:00
LCastr0
4cdb652b79 Removed winter items from infused chests 2017-01-18 20:35:17 -02:00
LCastr0
ad9caa68a0 Small change to treasure page 2017-01-18 20:34:16 -02:00
LCastr0
f93794f14d Removed permissions for snr mods to use unlock cosmetics 2017-01-18 20:31:35 -02:00
LCastr0
6ba1901490 Revert "Revered changes to chest page"
This reverts commit 419c4b1053.
2017-01-18 01:07:50 -02:00
LCastr0
419c4b1053 Revered changes to chest page 2017-01-18 00:52:36 -02:00
LCastr0
3e16c7fdf0 Added items to love chest (missing win room) 2017-01-17 23:34:16 -02:00
LCastr0
d49e85c21a Corrected chances for love chest 2017-01-17 23:30:29 -02:00
LCastr0
447a1cee18 Removed unused code 2017-01-17 23:28:19 -02:00
LCastr0
09c43ce73b Added love chets to titles tracking 2017-01-17 23:26:09 -02:00
LCastr0
65cc1b598d Change Flame Rings icon
Fixed issue with buy chest button
2017-01-17 21:08:38 -02:00
LCastr0
75ede7f823 Fixed present danger display item 2017-01-17 20:21:37 -02:00
LCastr0
27aa682727 Stops players from purchasing the chest 2017-01-17 20:20:17 -02:00
LCastr0
76b356f73c Removed gingerbread chest 2017-01-17 19:24:27 -02:00
Sam
1a580251e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-17 09:51:17 +00:00
LCastr0
cdd1e63989 Ops, are we back in time? Fixed lore saying 2012 instead of 2017 2017-01-17 06:30:47 -02:00
LCastr0
ccd490b41a Added love chest 2017-01-16 21:06:24 -02:00
LCastr0
819741d8ff Removed gadget selection since it will only work during games 2017-01-16 19:55:28 -02:00
LCastr0
a70c8eccc6 Blow a kiss taunt 2017-01-16 19:43:49 -02:00
LCastr0
ddc098649f Cupid Pet 2017-01-16 19:28:06 -02:00
LCastr0
694b2f69b2 Love train mount 2017-01-16 19:02:22 -02:00
LCastr0
ebfd6e5cc5 Use correct way for adding pets to ppc 2017-01-16 04:19:57 -02:00
LCastr0
c571736def Silent villager 2017-01-16 01:57:42 -02:00
LCastr0
9e4f756fe8 Even better way of making pet circle around you 2017-01-15 02:46:44 -02:00
LCastr0
7600cd6e04 Added enderman gun 2017-01-15 00:07:48 -02:00
LCastr0
46552428a4 Make them slower 2017-01-14 23:55:24 -02:00
LCastr0
6e399b10db Increased radius 2017-01-14 23:27:02 -02:00
LCastr0
3d49eb2181 Better way to handle the circle points 2017-01-14 23:21:49 -02:00
LCastr0
2398fbc8c9 Added correct ppc lore 2017-01-14 23:15:41 -02:00
LCastr0
6c75f6e7dc Showing correct icon for pets 2017-01-14 23:12:31 -02:00
LCastr0
fb05a08e91 Merge branch 'develop' into update/true-love-pet 2017-01-14 23:10:20 -02:00
LCastr0
e03b59bb7c Added love wings to gadget manager 2017-01-14 22:22:17 -02:00
LCastr0
03c2ec56b7 Added love wings 2017-01-14 22:21:38 -02:00
LCastr0
33cb3b74fc Added love doctor morph to gadgetmanager 2017-01-14 22:11:25 -02:00
LCastr0
fa9f895891 Use the correct event 2017-01-14 21:01:18 -02:00
LCastr0
d667524ed9 Love Doctor Morph 2017-01-14 20:50:44 -02:00
LCastr0
2976eab5bf Added particles 2017-01-14 20:06:12 -02:00
LCastr0
8c11f2c4cb Added True Love Pet 2017-01-14 18:57:40 -02:00
cnr
ef53ae5737 Reinstate missing _showInterface check 2017-01-14 13:59:06 -06:00
cnr
5ba3fac58c Check twofactor status instead of interact events 2017-01-14 01:29:37 -06:00
LCastr0
babc72a87c Fixed lore 2017-01-13 23:31:22 -06:00
samczsun
1a5a530133 Fix Evolution crash 2017-01-13 23:30:13 -06:00
cnr
bb2477676c Add missing diff from PP-Bizon fix 2017-01-13 14:24:48 -06:00