JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,526 Commits 1 Branch 0 Tags 481 MiB
18d998fc04
Commit Graph

4526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ty Sayers
17fbd42b9c Fix bug where a players inventory was not properly updated after switching to SURVIVAL mode, causing CustomGear items to remain unhidden an JSON encoded. 2015-10-02 14:30:39 -04:00
Ty Sayers
a110cd6d9c Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-10-02 13:58:06 -04:00
Ty Sayers
661bba3714 Fix offensive skill exploit where players could swap hotbar slots quickly and keep their original offensive spell casting for a large damage and speed advantage (running and attacking). Fix bug edge-case where outgoing slot packets were being missed, causing players CustomGear items to improperly display encoded JSON data instead of a user-friendly item description. 2015-10-02 13:57:46 -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
9c38e8039e Add clans to compiler 2015-10-01 22:59:42 -04:00
Shaun Bennett
5bce1b5f2e Fix merge issues, fix observer command 2015-10-01 22:57:39 -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
b8cc967fb0 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
 2015-09-30 19:32:33 -04:00
libraryaddict
86cdd7a30e Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-10-01 04:39:26 +13:00
Ty Sayers
506d39482c Merge pull request #66 in MIN/mineplex from clans_custom_gear to clans-beta 
* commit 'd870ff6f115bafc7d150f9afda8d9b4bba833ce3': (157 commits)
  Fix bug where Fissure could be exploited with Arctic Armour for 'water bending', allowing players to artificially create Water towers by bending temporary ice.
  Fix Illusion bug causing the Illusion clone to not properly function and spawn inside Clan territories. Fix bug where Carrots and Potatoes purchased from the Produce shop could not be eaten. Fix bug with SQL query when adding new enemies and not initialized 'initiator' field with a proper value. Modify starting score values for clan wars to 0 instead of 20. Update CustomItem descriptions with bullet points instead of hyphens for more readable stats. Reword error messages associated with trusting non-allied clans to be more intuitive to players.
  Fix priority for dupe fix
  Food Dupe Fix
  Fix for punishments to match names exactly Fix for expiring ranks. Fix for EU Lobby count.
  Should include the file with the change commit.
  Fixed lobby balancing technique. Removed random UUID for bungee redis database. Enabled bungee name in debug output for bungee rotator.
  NBT overflow patch
  Add created by, enabled by, and disabled by to botspam module
  BotSpam Module
  Add vote3 to bonusmanager
  Add pages to spectator and in-progress server menu
  Fixing up Gem signs, Effects etc.
  Adding Gem signs.
  last fix in the listAreaInfo method.
  adding area info command.
  forgot to add command to remove potion effects.
  fixing @p on signs, adding potioneffects and gadgets to areas.
  Added 60s delay to timings enable check.
  fixed duplicate rank name
  ...
 2015-09-29 17:48:23 -05:00
Ty Sayers
d870ff6f11 Fix bug where Fissure could be exploited with Arctic Armour for 'water bending', allowing players to artificially create Water towers by bending temporary ice. 2015-09-29 18:47:24 -04:00
Ty Sayers
b4c9bfbb57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
 2015-09-29 18:09:52 -04:00
Ty Sayers
ab1ac379a7 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-09-29 17:36:51 -04:00
Ty Sayers
bc7615a5c3 Fix Illusion bug causing the Illusion clone to not properly function and spawn inside Clan territories. Fix bug where Carrots and Potatoes purchased from the Produce shop could not be eaten. Fix bug with SQL query when adding new enemies and not initialized 'initiator' field with a proper value. Modify starting score values for clan wars to 0 instead of 20. Update CustomItem descriptions with bullet points instead of hyphens for more readable stats. Reword error messages associated with trusting non-allied clans to be more intuitive to players. 2015-09-29 17:36:42 -04:00
Shaun Bennett
f8ef46abde Merge master code into clans 2015-09-28 21:41:05 -04:00
Shaun Bennett
14027b9780 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-09-28 21:03:00 -04: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
libraryaddict
1394df03e0 For now, set all boss battles games to spider 2015-09-25 16:43:53 +12:00
libraryaddict
e94eb056dc Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-09-25 14:09:18 +12:00
libraryaddict
2a77eda4fc Spider boss code 2015-09-25 14:08:47 +12:00
libraryaddict
69517a3dcb Refresh the name after custom stuff is done so it applies on disguises 2015-09-25 14:08:27 +12:00