Commit Graph

4263 Commits

Author SHA1 Message Date
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
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
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 80bc493b6f Merge pull request #67 in MIN/mineplex from thanos-bug-fixes to master
* commit '2504493ebc9cc9b0043d7a64f949f2237ba71381':
  Fixed four super paintball bugs.
2015-10-04 00:23:23 -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
Shaun Bennett 993c9783ec Add Votifier Jar, display team stats for SG, SW, SSM 2015-10-02 13:15:02 -04:00
Shaun Bennett 855bb89200 Update .gitignore with IntellIJ tasks file 2015-10-01 14:50:15 -04:00
Shaun Bennett 8911617a0c Remove BungeeSigns again? 2015-10-01 14:01:36 -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
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
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
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
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
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
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
Shaun Bennett 901dad2f8a Add vote3 to bonusmanager 2015-09-17 22:31:18 -04: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
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
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