Commit Graph

4388 Commits

Author SHA1 Message Date
Jonathan Williams 998d5f6984 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 21:25:29 -06:00
Jonathan Williams 061a7b7c73 Fixed Pet FK errors.
Added SUPPORT to acceptable updateRank command.
2015-10-10 21:24:47 -06:00
Cheese 8b75664627 queued holiday transactions 2015-10-11 12:54:35 +11:00
Cheese 6860fa608a titan placeholder perks
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
Mysticate 72d943f51b Restored skills to pre-eula ultra 2015-10-10 16:20:28 -04:00
Mysticate 5a8e500ec0 Fixed another thing 2015-10-10 16:15:10 -04:00
Mysticate 5e7ddb968e Changes and bug fixes. 2015-10-10 15:54:18 -04:00
Cheese da6b1316d3 removed pumpkins from MPS 2015-10-10 22:47:19 +11:00
Cheese 323842c693 fixed mods staying in flight 2015-10-10 19:36:38 +11:00
Cheese 6f14c75f70 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 19:28:26 +11:00
Cheese 6cf786eb8c Merge branch 'Myst_HALLOWEEN' 2015-10-10 19:28:08 +11:00
Cheese 1026a2ae22 fixed explosions 2015-10-10 19:27:54 +11:00
Shaun Bennett a242c6b592 Halloween Update finishes 2015-10-10 03:23:37 -04:00
Cheese e9207acd7f Merge branch 'alex-halloween' 2015-10-10 17:38:09 +11:00
Cheese 7bc3b4970b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
AlexTheCoder 67a1f4ce8d Titan Giveaway:
- Added Titan pumpkin animation
Titan Perks (For later, Removed from Menu):
- Added Kronos Particle
2015-10-10 02:31:52 -04:00
Mysticate 930cfa5cb8 DONE 2015-10-10 02:30:11 -04:00
Shaun Bennett f1e9acbb58 Titan giveaway 2015-10-10 02:19:05 -04:00
Mysticate 245a42c8e0 animation is sexi 2015-10-10 02:13:04 -04:00
Mysticate 30a9196430 Done with animation. 2015-10-10 01:43:31 -04:00
Mysticate 9a7357e484 Work 2015-10-10 01:00:49 -04:00
Shaun Bennett 36fabf93b6 Merge remote-tracking branch 'origin/master' 2015-10-09 23:14:13 -04:00
Shaun Bennett bc7bf8a2e2 fixes/debug 2015-10-09 23:13:39 -04:00
Jonathan Williams 512e08af19 Removed all create table statements. 2015-10-09 21:02:35 -06:00
Mysticate 1127764cc3 Secsi 2015-10-09 22:44:49 -04:00
Mysticate 7851cb451a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
Shaun Bennett aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Mysticate 90c685617d Animation 2015-10-09 22:14:01 -04:00
Peter Miller 611fb88f15 Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load). 2015-10-09 20:40:50 -04:00
Cheese ed89f5f4cc anim example for myst 2015-10-10 10:46:12 +11:00
Cheese 43f38c18ee animation 2015-10-10 10:40:44 +11:00
Cheese d99c64e45d fixed merge error 2015-10-10 10:37:20 +11:00
Cheese 02c6eccfda Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
2015-10-10 10:36:42 +11:00
Cheese 7dbd9da582 dragon sale Bar 2015-10-10 10:35:48 +11:00
Shaun Bennett ba36ff565d Merge remote-tracking branch 'origin/master' 2015-10-09 18:23:55 -04:00
Shaun Bennett 97ef4a4252 Pushing titan giveaway stuff for laptop 2015-10-09 18:23:47 -04:00
Jonathan Williams 586cc6e3e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-09 09:40:58 -06:00
Mysticate ff1431b652 Fixed players glitching to chests before game starts. 2015-10-09 10:21:35 -04:00
Cheese ff42e05a8d Merge branch 'Myst_HALLOWEEN' 2015-10-09 14:20:58 +11:00
Cheese 99fd88473b rank colors 2015-10-09 14:20:02 +11:00
Mysticate fb4d08931c Spider mount improvements. 2015-10-08 23:18:37 -04:00
Cheese d9dd471db6 removed annoying debug 2015-10-09 14:04:12 +11:00
Cheese c03c8163c5 fixed exploision stuff 2015-10-09 14:01:58 +11:00
Mysticate 90d0fcb36d Merge branch 'Myst_HALLOWEEN' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN 2015-10-08 22:53:45 -04:00
Mysticate 598ea84e7a Fixed explosions and cleaned up. 2015-10-08 22:52:57 -04:00
Cheese d18353e592 Merge branch 'Myst_HALLOWEEN' of ssh://184.154.0.242:7999/min/Mineplex into Myst_HALLOWEEN
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-09 13:44:41 +11:00
Cheese 41678eaf35 fixed scoreboard bug 2015-10-09 13:42:37 +11:00
Mysticate 1011c36c43 Fixed lobby being destroyed. 2015-10-08 22:41:45 -04:00
Mysticate 96f14f4fda Fixed kit item names. 2015-10-08 22:31:20 -04:00
Mysticate 3802d47a37 Made the thing bold. 2015-10-08 22:29:22 -04:00
Mysticate 082b16fe0d Stuff and things to help make mounts be cool. 2015-10-08 22:28:07 -04:00
Cheese 54c76c9d9c fixed text 2015-10-09 12:27:30 +11:00
Cheese a234fbce1e Merge branch 'Myst_HALLOWEEN' 2015-10-09 12:17:57 +11:00
Mysticate ed31bf9886 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-08 21:16:24 -04:00
Mysticate 9254ca9162 K reverted + fixed bug 2015-10-08 21:12:38 -04:00
Cheese 24568a40f3 Merge branch 'Myst_HALLOWEEN' 2015-10-09 12:05:24 +11:00
Cheese 483ab13c2b workaround for error where accountid is never set 2015-10-09 12:04:35 +11:00
Cheese 17ba04348d stats debug 2015-10-09 11:53:08 +11:00
Mysticate 84cbee4535 Fixed it again 2015-10-08 20:52:17 -04:00
Mysticate 145832b326 Fixed mounts bc chiss is bad 2015-10-08 20:50:39 -04:00
Cheese 21dc0dc962 Merge branch 'Myst_HALLOWEEN' 2015-10-09 11:47:20 +11:00
Cheese ec5694737c statsmanager debug
rank fix
2015-10-09 11:44:12 +11:00
Mysticate 2cace7419f Made Destructor sexi 2015-10-08 20:42:29 -04:00
Mysticate 92bab25a3f Fixed Gust void stealing. 2015-10-08 20:38:33 -04:00
Mysticate b8597d7161 Paintball stats. 2015-10-08 20:37:26 -04:00
Mysticate cdb9741438 Changed the SG icon in hub, fixed EULA breaking thing in Class Shop 2015-10-08 20:36:16 -04:00
Mysticate 97d6f8fb42 Fixed placing walls in water. 2015-10-08 19:10:19 -04:00
Mysticate 8f826f6e83 Fixed blocks falling into floor in Build. 2015-10-08 19:04:51 -04:00
Mysticate 30e3c56635 Fixed ground issues in BUILD. 2015-10-08 18:58:30 -04:00
Mysticate 46bf963d44 Fixes not being able to reload dropped guns w/ 0 ammo. 2015-10-08 18:56:23 -04:00
Mysticate 979e68dcc7 Fixed the Minestrike multiple grenades bug. 2015-10-08 18:41:40 -04:00
Mysticate ef62fb5adf Made it so that when played on an MPS, HH won't give items. Yay! 2015-10-07 22:57:30 -04:00
Mysticate 8a8591ae7f Merge branch 'master' of
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
Myst_HALLOWEEN

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
2015-10-07 22:19:10 -04:00
Mysticate 668454f156 Fixed things 2015-10-07 22:10:57 -04:00
Mysticate f2485854ef Improved spider. 2015-10-07 22:06:57 -04:00
Mysticate 70f3ccf703 Fixed spider morph 2015-10-07 21:53:23 -04:00
Mysticate e864e0867a Adds mount spider and fixes a BH bug. 2015-10-07 21:47:10 -04:00
Cheese 3c437925f1 halloween prep 2015-10-08 12:36:00 +11:00
Cheese 191392825f Merge branch 'Myst_EVO' 2015-10-08 12:07:21 +11:00
Cheese f28d83cbd7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-08 12:05:51 +11:00
Cheese c94184c5ae reduced number of falling blocks in skywars by 80%
added halloween horror mount
2015-10-08 12:04:28 +11:00
Mysticate 5378ece214 Fixed chicken being able to fly.. 2015-10-06 21:09:53 -04:00
Mysticate a0d0590777 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-10-06 21:04:49 -04:00
Shaun Bennett 8fb82507e1 Merge remote-tracking branch 'origin/master' 2015-10-06 12:24:34 -04:00
Shaun Bennett 9cb3f250e2 Remove streak record data until a better solution is done 2015-10-06 12:24:16 -04:00
Cheese e2e2356b04 stuffs 2015-10-06 13:25:15 +11:00
Mysticate 643f47763e Improved consistency with the F5 message 2015-10-04 20:28:21 -04:00
Mysticate 0de34c15ab NO more endercrystal go boom boom yay 2015-10-04 20:23:41 -04:00
Thanos paravantis 9c1ba5f3d1 Changes on bomb error messages after QA recommendations. 2015-10-04 21:23:50 +03:00
Jonathan Williams 0eeea58a01 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-04 11:50:20 -05:00
Jonathan Williams 9f1c4653f4 Fix for Customer support item command with the removal of item categories. 2015-10-04 11:48:16 -05:00
alexmack929 6c73b1a5ac Start moving i18n into master. 2015-10-04 15:24:58 +01:00
Thanos paravantis c2518bc6c4 Some additional bug fixes were applied on the previous commit.
Water damage by TNT on game lobbies is now patched.
2015-10-04 16:32:34 +03:00
Thanos paravantis 026c596de2 Minestrike bug fixes and minor changes
- Added a right-click message tip when the player with a bomb tries to place by left clicking.
- Changes in one of the tip messages while in game lobby.
- Moltovs and Incendiaries were not triggered once thrown to the ground.
- Players were able to extinguish grenade fire with a knife.
- The bomb was able to be planted after a round was over.
- On sniper rifles, scope was not removed if the match was ended.
2015-10-04 13:22:12 +03:00
Jonathan Williams f9ea325da1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-04 00:24:11 -05:00
Jonathan Williams ba17404212 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-04 00:20:52 -05:00
Jonathan Williams 1830705692 Removed ItemCategories to reduce strain on the database with queries that are more complex than they need to be.
Increased Firework recharge time.
2015-10-04 00:20:41 -05:00
Thanos paravantis 2504493ebc Fixed four super paintball bugs.
- Projectiles could paint wool in the waiting lobby.
- When players fell in the void, they didn't got killed.
- Players that were painted could take off their armor.
- Players that were painted could logout and the skeleton would still stay there.
2015-10-04 00:34:00 +03:00
Mysticate a7ab0cd723 ADDED MORE KITS I'M DONE HOORAY LOVE ME @CHISS 2015-10-02 22:43:29 -04:00
Mysticate c9ff420a79 Now chooses a different maze every game. 2015-10-02 20:43:57 -04:00
Shaun Bennett 993c9783ec Add Votifier Jar, display team stats for SG, SW, SSM 2015-10-02 13:15:02 -04:00
Shaun Bennett 8911617a0c Remove BungeeSigns again? 2015-10-01 14:01:36 -04:00
Mysticate 3f6490f14a Gave health on safe pad <<<<<3 2015-10-01 10:47:37 -04:00
Jonathan Williams bc84dc6817 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-01 07:39:17 -07:00
Jonathan Williams 631bd9cfa6 Removed sale notification.
Removed queue create table query.

Added try-catch for ServerMonitor to prevent stat storage from affecting normal operation.
2015-10-01 07:38:59 -07:00
Mysticate a6d7cccbe5 Fixes 2015-09-30 22:31:03 -04:00
Mysticate 4a023c4644 Tweaks - I THINK I'M DONE HOORAY 2015-09-30 21:21:29 -04:00
Mysticate 05b735ba40 Fixed jump system 2015-09-30 20:28:35 -04:00
Mysticate c39806a4e3 Kewl stuff. Yay 2015-09-30 20:01:51 -04:00
Mysticate 09ef2d73ae Grammar <3 2015-09-30 19:45:29 -04:00
Mysticate 68c6ba595e Visual enhancements. 2015-09-30 19:31:36 -04:00
Mysticate d089ffeb30 Added a firework when a mob gets rekt 2015-09-30 18:48:45 -04:00
Mysticate 250e9cff13 Fixed a possible NPE 2015-09-30 18:43:52 -04:00
Mysticate a25e2c575d Peace of mind stuff. 2015-09-30 18:35:56 -04:00
fooify c3b2c10934 FINALLY FIXED THIS MONSTER MAZE BUG :D 2015-09-29 19:14:18 -07:00
Mysticate 2d173a5be4 Fixed a jumper perk. 2015-09-28 21:03:58 -04:00
fooify bcfd8fcec7 bug fixes:
- fixed bugs
- fixed more bugs
- after that, more bugs were fixed
2015-09-28 17:54:56 -07:00
Shaun Bennett 437e62c7db Fix priority for dupe fix 2015-09-28 20:44:57 -04:00
Shaun Bennett 8a9cc9ff14 Food Dupe Fix 2015-09-28 20:42:14 -04:00
Mysticate 00eecc0325 Fixes 2015-09-28 20:33:38 -04:00
fooify 3a10677b10 AI bug should be fixed, I need Mysticate to test though 2015-09-28 15:15:51 -07:00
Shaun Bennett 92436c8f9d Merge pull request #60 in MIN/mineplex from alex-bugfixes to master
* commit '8a94602aefc1e4ea3490da434f14205f99ba1d8e':
  Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text
  Made rank unlock lore colored based on rank required for item (QA Requested)
  Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.
  Marked the Bunny Morph to reflect its no longer available status
  Fixed previous ownership not being transferred
  Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
  Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui
2015-09-27 22:39:50 -05:00
Mysticate 00a8cf769b Swag 2015-09-27 14:55:37 -04:00
Mysticate 7e40d0d4bb Lots of cool stuff 2015-09-27 12:10:52 -04:00
Mysticate eea7ef8350 Swag 2015-09-27 02:11:28 -04:00
Mysticate 54eca7fa9e Lots of work. 2015-09-26 23:18:05 -04:00
Jonathan Williams eae894c879 Merge pull request #65 in MIN/mineplex from mrsomeone12_SmallFixes to master
* commit '436f63860ecef028d23dae28ceb52e466e90270b':
  NBT overflow patch
2015-09-26 17:32:30 -05:00
Jonathan Williams ee5934c7aa Fix for punishments to match names exactly
Fix for expiring ranks.
Fix for EU Lobby count.
2015-09-26 18:31:37 -04:00
Jonathan Williams 1ad61a09e4 Should include the file with the change commit. 2015-09-26 18:30:45 -04:00
Jonathan Williams 0d8ef7fea3 Fixed lobby balancing technique.
Removed random UUID for bungee redis database.
Enabled bungee name in debug output for bungee rotator.
2015-09-26 18:25:29 -04:00
Mysticate 9350386361 Lots of things. :D 2015-09-26 15:08:43 -04:00
Mysticate 8e9a3e90a7 Merge branch 'monster-maze' of
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
2015-09-26 00:00:46 -04:00
Mysticate 30d2281785 Lots of things 2015-09-25 23:59:31 -04:00
fooify 1e018cf74a Improved Smasher 2015-09-25 20:21:06 -07:00
Mysticate 2de409c2f2 Made the mazes do things. 2015-09-25 20:14:46 -04:00
xGamingDudex 436f63860e NBT overflow patch
Patch for the NBT overflow exploit which allowed any player to overflow
and drain the server for memory making it freeze and eventually crash.
2015-09-26 01:48:38 +02:00
Mysticate a0ec656bc1 Fixed another tracker. 2015-09-25 12:49:21 -04:00
Mysticate b2f1f7d2ae Fixed the tracker for pilot. 2015-09-25 11:38:32 -04:00
Mysticate e66d8765e7 Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze 2015-09-24 23:02:27 -04:00
Mysticate 60c4e5812a Fixed trackers 2015-09-24 23:02:19 -04:00
fooify 69ed764483 Added another maze. 2015-09-24 19:55:43 -07:00
Mysticate a9f20a573c Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze 2015-09-24 21:10:31 -04:00
Mysticate 9a70d4997a Fix 2015-09-24 21:10:12 -04:00
Mysticate d9b6d8f0e3 Changes 2015-09-24 21:01:18 -04:00
AlexTheCoder cd33bf8dd8 - Fixed updaterank and testrank scoreboard conflict 2015-09-24 11:47:50 -04:00
AlexTheCoder a488bfab3e - Rewritten testrank system
- Multiple rank improvements for real-time use
- Removed /updaterank from Jr.Dev
2015-09-24 11:44:45 -04:00
Mysticate 7445fda922 Made the thing a lot better. Yay! :D 2015-09-24 11:04:05 -04:00
fooify 4663aa3eaa updated mazes 2015-09-24 07:29:48 -07:00
Mysticate 5de016c077 Merge branch 'monster-maze' of
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 23:46:21 -04:00
Mysticate 842da3d6fb Tons of changes. 2015-09-23 23:44:10 -04:00
fooify a301c87efc workstuffchanges on monster maze 2015-09-23 19:23:21 -07:00
Christopher Jozsa 9a3ef895c9 Merge pull request #38 in MIN/mineplex from mrsomeone12_SmallFixes to master
* commit '633cbdabe279a9ec1a57d96d6585f58a6d3754df':
  player.isOnGround() is controlled by packets from the player, meaning players can easily fake being on the ground resulting in infinite double jumps. player.getFallDisance() is also reset when isOnGround() returns true, meaning we'll need to manually check if the player is on the ground.
2015-09-23 19:37:48 -05:00
Mysticate 125b823a65 Fixed achievement arcade page size. 2015-09-23 15:43:14 -04:00
Mysticate 71408fabd2 One thing. 2015-09-23 15:24:34 -04:00
Mysticate 81e780d400 Merge branch 'monster-maze' of
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MMMazes.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 15:23:08 -04:00
Mysticate 84331901d4 Added achievements and final polish. 2015-09-23 15:18:44 -04:00
fooify 0ad91a6b0b more changes! :D 2015-09-23 07:10:48 -07:00
Shaun Bennett 2b902c5193 Add created by, enabled by, and disabled by to botspam module 2015-09-23 00:25:39 -04:00
Shaun Bennett 3ae043e7d8 Merge remote-tracking branch 'origin/master' 2015-09-22 01:38:52 -04:00
Shaun Bennett cf618abd4e BotSpam Module 2015-09-22 01:38:45 -04:00
Cheese 4519f2dda1 Merge branch 'EventGameUpdates' 2015-09-22 14:59:17 +10:00
fooify 1f84907309 more changes to monstermaze 2015-09-20 07:40:24 -07:00
fooify 0581474a16 lots of work on Monster Maze 2015-09-18 08:25:11 -07:00
Shaun Bennett 901dad2f8a Add vote3 to bonusmanager 2015-09-17 22:31:18 -04:00
Cheese aa30c866fd flurrry 2015-09-18 10:22:16 +10:00
libraryaddict 5e8fc77164 Add pages to spectator and in-progress server menu 2015-09-17 04:34:45 +12:00
Sarah 362d99a819 Fixing up Gem signs, Effects etc. 2015-09-15 07:10:39 +02:00
Cheese ac269839c5 squid skill 2015-09-14 14:14:06 +10:00
Cheese d9142ac33f smash balance 2015-09-14 12:34:55 +10:00
fooify 2de7fff267 Merge remote-tracking branch 'origin/master' into monster-maze 2015-09-13 08:45:34 -07:00
fooify aa8cb8943e more work on monster maze 2015-09-13 08:42:26 -07:00
Sarah 7ca6f58108 Adding Gem signs. 2015-09-13 10:25:44 +02:00
Sarah a46cb2c274 last fix in the listAreaInfo method. 2015-09-13 00:35:22 +02:00
Sarah 53d5c2fd0e adding area info command. 2015-09-13 00:30:55 +02:00
Sarah 112f94a842 forgot to add command to remove potion effects. 2015-09-13 00:00:47 +02:00
Sarah fcec6253cd fixing @p on signs, adding potioneffects and gadgets to areas. 2015-09-12 23:56:38 +02:00
Sarah b6ffee73f5 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates 2015-09-12 21:17:45 +02:00
fooify 55ac104e2c took forever to get it working, but the maze parsing works! :) 2015-09-12 09:50:06 -07:00
Jonathan Williams 1417d31b73 Added 60s delay to timings enable check. 2015-09-11 23:57:26 -07:00
Cheese c9971bb117 fixed duplicate rank name 2015-09-12 16:45:22 +10:00
Cheese 6216f2ced4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-09-12 16:33:44 +10:00
Jonathan Williams a7d4a7534f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-09-11 22:51:04 -07:00
Jonathan Williams 2380b9041d Added automatic timings report in the event of lag.
Added more exception handling around LoadingWindow
2015-09-11 22:50:53 -07:00
Cheese 119dc8ab52 changed name of method 2015-09-12 15:01:18 +10:00
Sarah 5c0ada3df6 Implementing RequiredRank file and command. 2015-09-12 06:39:40 +02:00
Cheese 4184fe20cf minor fixes 2015-09-12 14:09:04 +10:00
Sarah b56813deef Improving /e commands (/e kick, /e area, etc) 2015-09-12 04:33:10 +02:00
Cheese 5a79c51506 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-09-10 13:57:48 +10:00
Cheese a4cc70c3f0 new small youtuber rank 2015-09-10 13:17:11 +10:00
fooify 5824ec6df0 lots of changes to monster maze, check trello for list 2015-09-07 07:08:00 -07:00
Sarah 4240026024 Adding Areas and a few more commands like /e kick and /e tempgadget to the event game. 2015-09-06 18:55:00 +02:00
Sarah 5712af8ddc Adding Redstone function signs for events. 2015-09-05 20:38:51 +02:00
fooify c648d7c186 stuff, things...things, stuff (Monster Maze) 2015-09-05 09:30:51 -07:00
fooify 9e3f87b71e more edits to MM
- displaying more information
- permanent safezones around the map
- spawn now does not deteriorate, is permanent
2015-09-05 06:41:10 -07:00
Jonathan Williams 4bb100b6be Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-09-05 01:53:45 -07:00
Jonathan Williams 4ad95b54cf Updated ServerMonitor status reporting for network. 2015-09-05 01:53:37 -07:00
Jonathan Williams 2536d8a437 Fixed out of range stats causing no stats to load.
Issue fix to db for out of range stat on login.
2015-09-05 01:40:56 -07:00
Cheese 0ac808ba43 stacker pref is now only for pvp stacking. 2015-09-05 10:30:11 +10:00
Cheese fc5ccd4a5e fixed 'self scoring' in Soccer
removed silverfish on wither pet despawn
2015-09-05 10:04:54 +10:00
Cheese 106a7dab2e removed ability for entities to change blcoks in hub 2015-09-05 09:48:06 +10:00
Mysticate 271b86dabd Fixed spectators slowing evolution times. 2015-09-04 11:45:42 -04:00
Jonathan Williams 921292a5c6 Added timings capture and server log copy on server kill inside server monitor. 2015-09-03 09:38:26 -07:00
Jonathan Williams 890c9d59e1 Fixed loading window bug.
Added default rank for CoreClient in case of bugged login.
2015-09-03 09:38:02 -07:00
Mysticate 0c58de3c19 Glitches. Fixed the things. 2015-09-01 02:35:06 -04:00
Mysticate b4ce33a916 Fixed things.
• Added a cancelled check to No Ability 
• Removed tokens on quit.
• Checked if players are alive before giving them places.
2015-09-01 01:59:36 -04:00
AlexTheCoder 8a94602aef Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text 2015-08-31 16:03:27 -04:00
AlexTheCoder fe4586852c Made rank unlock lore colored based on rank required for item (QA Requested) 2015-08-31 15:59:53 -04:00
AlexTheCoder cbb0d4521c Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for. 2015-08-31 15:49:31 -04:00
AlexTheCoder 5322e9d018 Marked the Bunny Morph to reflect its no longer available status 2015-08-31 15:48:25 -04:00
AlexTheCoder 24fed013ae Fixed previous ownership not being transferred 2015-08-31 15:39:04 -04:00
AlexTheCoder 32a257fa55 Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts 2015-08-31 15:11:57 -04:00
AlexTheCoder b63843930f Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui 2015-08-31 15:08:42 -04:00
Sarah 503b68da2f Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates 2015-08-31 11:32:47 +02:00
Sarah 58ae09ebd4 saving Project for pulling. 2015-08-31 11:32:18 +02:00
Jonathan Williams c61f9ce3c8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-31 00:53:23 -07:00
Jonathan Williams 740899c09e Added dummy CoreClient in the rare event a player joins and gets disconnected during the join event????Weird
Fixes Lobby crashes.
2015-08-31 00:53:07 -07:00
Mysticate becfbe1f13 Fixed possible game breaking bug :S 2015-08-30 20:09:47 -04:00
Mini-Chiss d79794c6d3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-30 15:47:57 -07:00
Mini-Chiss bb66d47e8e meow 2015-08-30 15:47:49 -07:00
Mysticate 33d78a5efd Fixed eating spider eye. Yay! 2015-08-30 18:39:07 -04:00
Ty Sayers b0efe35531 Add restriction to ServerCommand that prevents players from directly connection to a Clans-X server, and instead insists that they join through a Clans hub. 2015-08-30 13:14:01 -07:00
Jonathan Williams 47331658ac Merge remote-tracking branch 'remotes/origin/Myst_EVO' 2015-08-30 00:14:53 -07:00
Jonathan Williams b59511ece4 Added duplicate login kick for network. 2015-08-30 00:12:54 -07:00
Jonathan Williams c2c23c22e5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-29 14:55:04 -07:00
Jonathan Williams 4e32bad8dd Fixed bug with stats pulling as int.
Fixed bug with Poll recording selections wrong.
2015-08-29 14:54:57 -07:00
Ty Sayers 088068be80 Add 'Clans' to the ignored server groups for ServerMonitor to prevent interference with live Clans servers. 2015-08-29 14:51:17 -07:00
Mysticate 046fa4f8b6 Fixed possible NPE 2015-08-29 14:30:22 -06:00
Mysticate 736d88c82f All achievements fixed. ^_^ 2015-08-29 14:13:15 -06:00
Mysticate 97c7980bbc Fixed evolving into walls. 2015-08-29 10:54:04 -06:00
Mysticate 55a7ea0439 Fixed kit bug. 2015-08-29 10:44:11 -06:00
Mini-Chiss 9ebabed1a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-29 00:14:26 -07:00
Mini-Chiss 6a28845cb0 Merge branch 'Myst_EVO' 2015-08-29 00:14:15 -07:00
Mysticate 12d9888a1f Fixed wins.. 2015-08-29 00:58:53 -06:00
Jonathan Williams f8729cbd66 Fixed Gadget. 2015-08-28 23:47:27 -07:00
Mini-Chiss d35b5940fc fixed achievements 2015-08-28 23:30:21 -07:00
Mini-Chiss 5ae01f95a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-28 23:27:35 -07:00
Mini-Chiss 181afaa2d6 Merge branch 'Myst_EVO' 2015-08-28 23:25:51 -07:00
Mysticate b71bcfab4b Fixed achievements. Merge ASAP 2015-08-29 00:19:39 -06:00
Jonathan Williams d4d0c4bed6 Updated Motd. 2015-08-28 23:17:14 -07:00
Jonathan Williams c98a85c2ba Added local storage of login time.
Hooked in onlineTime bonus feature to real values.
2015-08-28 22:09:42 -07:00
Jonathan Williams ba4da32939 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-28 21:44:07 -07:00
Jonathan Williams e47662f855 Added LoginTime setting as RedisTime for use in calculating time on server.
Optimized redis util for time calls to calculate time different and only pull redis time once.
2015-08-28 21:44:00 -07:00
Mini-Chiss 829c1d2ae8 Merge branch 'Myst_EVO' 2015-08-28 21:30:10 -07:00
Mysticate c40fecb03f Removed warning from private servers 2015-08-28 22:06:13 -06:00
Mini-Chiss 041c5ab53c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-28 21:00:34 -07:00
Mini-Chiss 3f1c4d24b9 Merge branch 'Myst_EVO' 2015-08-28 21:00:00 -07:00
Jonathan Williams ad4ba010b7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-28 20:59:08 -07:00
Jonathan Williams 6f0309622c Removed AccountCache.
Converted that to PlayerCache and store account id in there.
2015-08-28 20:58:58 -07:00
Mysticate bb09720450 removed previous commit jesus 2015-08-28 21:56:35 -06:00
Mini-Chiss d68f1fa547 Merge branch 'Myst_EVO' 2015-08-28 20:50:27 -07:00