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

4783 Commits

Author SHA1 Message Date
NewGarbo 0c29805756 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-10-23 19:27:13 +01:00
NewGarbo 11b836da8b Added Join/Quit messages. 
Removed periods from attribute descriptions.
Fixed legendary item lore having incorrect formatting.
 2015-10-23 16:59:30 +01:00
libraryaddict 2eb8b3e234 Catch PacketHandler exceptions 2015-10-24 02:17:19 +13:00
libraryaddict 5ec4203fd9 More changes to disguise 2015-10-24 01:36:42 +13:00
libraryaddict a450b828b7 Fix disguises custom name 2015-10-24 00:48:54 +13:00
libraryaddict de9678a20f Modify Craftbukkit 2015-10-23 21:28:01 +13:00
Cheese af208da953 Merge branch 'alex-testrank' 2015-10-23 18:10:59 +11:00
Cheese d9d0254e46 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-23 17:30:59 +11:00
Shaun Bennett fd1638a572 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-10-23 02:17:57 -04:00
Shaun Bennett 5944b734be More war fixes - still needs tweaking 2015-10-23 02:17:47 -04:00
Shaun Bennett e3e7dd4694 Titan rewards from mythical chests 2015-10-23 02:08:31 -04:00
NewGarbo 4c381d41fe Fixed second tutorial task misspelling, and added the first tutorial, which is /c help, as I completely forgot about it in the first place. 2015-10-23 06:10:09 +01:00
NewGarbo 18d998fc04 Fixed colors cutting out in the middle of the message in task information, moar fireworks! 2015-10-23 05:56:53 +01:00
AlexTheCoder 1512d87f9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-23 00:28:32 -04:00
libraryaddict aedf04b3e3 Fix renaming pet not opening proper window 2015-10-23 09:26:21 +13:00
libraryaddict 53aa1b655b Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix 2015-10-23 09:20:24 +13:00
libraryaddict 8cde506a2c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-23 05:25:36 +13:00
libraryaddict ddb8d592f8 Remove all is1_8 checks 2015-10-22 18:37:14 +13:00
NewGarbo 825b519890 Finalization of tutorials, made my code more consistent, and renamed any parts of code that referred to tasks as parts refer to them as "tasks." 
Removed unused imports, and other code cleanup stuff.

Renamed EndTutorialCommand to SkipTutorialCommand as the actual command is "/skiptutorial" instaed of "/endtutorial"
 2015-10-21 21:50:46 +01:00
William Burns e6bec41ca8 Fix "code too large" error. 2015-10-21 20:29:44 +01:00
NewGarbo bf406493e3 Fixed tutorial tasks that rely on territory entrances not working because formatting... 2015-10-21 20:14:35 +01:00
libraryaddict 3cd803cda0 Update patch files and cb 2015-10-22 08:07:10 +13:00
Shaun Bennett 00a689ea03 War work 2015-10-21 14:48:27 -04:00
NewGarbo 112f34c77f Fixed NullPointerException when clicking outside of inventory GUI. 2015-10-21 08:10:53 +01:00
libraryaddict 5c010af8c4 Add updatehealth packet 2015-10-21 19:56:52 +13:00
Jonathan Williams c719d693dd Added delete benefit call for repository. 
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
 2015-10-21 01:15:09 -05:00
NewGarbo a5df50de92 On going map tutorials started and finished. 2015-10-21 06:55:06 +01:00
NewGarbo eb203131a7 Fixed import errors since I moved the getting started tutorial to a different package. 2015-10-21 06:19:23 +01:00
NewGarbo bd5266251b Finalized the getting started tutorial. 
Added the last 5 tasks, and added a nice big ending (fireworks)

Added an ugly fix to the QAResetCommand, which I am really unhappy about, but can't find any other way about it. It's only a test command though, so it'll be removed in the final releases.
 2015-10-21 06:17:18 +01:00
NewGarbo c6cf47ee4e I did not mean to commit that one line... Oh gosh that would have been bad... (addCoins onEnterTerritory). Was just for testing shops. 2015-10-21 04:36:47 +01:00
NewGarbo 227e9f7bfc Pretty much finished with tutorials, not fully though, but I am simply pushing so I don't lose all my work. 
CHANGES----

Added a little hack to ScoreboardElement.java that allows for a single element to clear the currently existing scoreboard lines output, or modify it.

Coded in the functionality of 7 tasks, will do the rest now.
 2015-10-21 04:27:14 +01:00
Cheese 768ef4eb97 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-21 13:00:16 +11:00
libraryaddict 8ceb69513a Update patches and cb.jar 2015-10-21 05:05:27 +13:00
libraryaddict 07f032a5d2 Fix wither pet making sounds, fixed worldtime. 2015-10-21 04:22:31 +13:00
libraryaddict ddd674e371 Packets implement Pcaket right 2015-10-20 17:19:46 +13:00
NewGarbo a2278297de Created the base for tutorials, and created the getting started tutorial. 
Have all the commands and most of the functionality in here now, but still need to do the scoreboard and some tweaking.
 2015-10-19 17:16:48 +01:00
libraryaddict b3caf7c2d4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-20 04:38:12 +13:00
libraryaddict 5d671d3300 Fix borders 2015-10-20 04:37:42 +13:00
Jonathan Williams 3ef33bd9c5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-19 01:32:23 -05:00
Jonathan Williams 5e307da15a Fix for inventory failure. 2015-10-19 01:32:12 -05:00
Shaun Bennett 6d7f15cd6d Fix hub time after light flicker 2015-10-18 18:52:16 -04:00
Cheese c7a5be9570 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-19 09:03:46 +11:00
libraryaddict 55f97ef984 More fixes, along with a fix for Block Hunt 2015-10-19 06:21:16 +13:00
Shaun Bennett 0a3f942575 Fix compile issue 2015-10-18 12:42:56 -04:00
Shaun Bennett 177e482dbc Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2015-10-18 12:35:31 -04:00
Jonathan Williams 9e7629b1fe Added 43k player chest benefit. 
Updated MOTD.
 2015-10-18 00:21:01 -05:00
Shaun Bennett 523378aae7 Clans War updates 2015-10-17 22:55:21 -04:00
Cheese d901cfa12c buildies can join full 2015-10-18 10:54:34 +11:00
libraryaddict 6f91827d57 Vector to Vector3f, updated Maze to 1.8 2015-10-18 12:40:01 +13:00
libraryaddict 02bf202d52 1.8 update 2015-10-17 13:21:03 +13:00
Shaun Bennett 589c05f8c0 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
 2015-10-16 14:25:31 -04:00
libraryaddict 3a0781b3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
 2015-10-17 00:10:32 +13:00
libraryaddict 14a524cf54 Stuff 2015-10-17 00:08:30 +13:00
Cheese 41b6fdc74e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-16 21:47:35 +11:00
Cheese 32489388c6 removed bug fix that caused SG break 2015-10-16 21:47:22 +11:00
libraryaddict f71cb80bd0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
 2015-10-16 22:26:07 +13:00
Jonathan Williams 172bd65c57 Monster Maze motd. 2015-10-16 04:22:54 -05:00
libraryaddict 70c76d976f More changes 2015-10-16 22:10:13 +13:00
Jonathan Williams 62b209fede Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-16 01:57:30 -05:00
Jonathan Williams d00fa856f3 Fixed Pets so they work correctly. 
Also fixed legend benefits.
Fixed chest pet rewards.
 2015-10-16 01:57:19 -05:00
Cheese 016cea15f3 Merge branch 'Myst_HALLOWEEN' 2015-10-16 15:01:59 +11:00
Mysticate b8eb924ffa Fixed timing out. Yay. I'm done. G'night 2015-10-16 00:00:08 -04:00
Cheese 577c67cacd Merge branch 'Myst_HALLOWEEN' 2015-10-16 14:18:35 +11:00
Mysticate b15b81a7e2 Spacing 2015-10-15 23:09:23 -04:00
Mysticate f0a22d5c36 Fixed hammer throw 2015-10-15 23:02:51 -04:00
Mysticate f0e0d41c42 Fixed two things. 2015-10-15 22:23:49 -04:00
Cheese 6cc33fd6c6 Merge branch 'thanos-bug-fixes' 2015-10-16 12:53:43 +11:00
Mysticate 41511dce7b Merge remote-tracking branch 'origin/master' into monster-maze 2015-10-15 21:19:24 -04:00
libraryaddict 3dda9352e7 Progress 2015-10-16 13:32:23 +13:00
libraryaddict 4205dc6c25 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
 2015-10-15 12:34:34 +13:00
Ty Sayers 98ec99cffc Fix bug where players could retrieve teleport items out of the Travel Hub shop and later use them in their inventory. Implement a safe zone region of one chunk around all administrative clans (excluding Wilderness), to prevent players from building/claiming next to admin clans. Disable pistons throughout the server to prevent griefing. Fix left-over merge issue with donation manager. 2015-10-14 16:06:34 -04:00
Cheese 1c52bd4f64 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-14 14:34:51 +11:00
Cheese 86bad0be30 mods can check other players skills 2015-10-14 14:34:30 +11:00
Shaun Bennett 0df637b80a Run punishBot in main server thread 2015-10-13 22:56:14 -04:00
Shaun Bennett f683e932ae Clans merge fixes 2015-10-13 22:24:15 -04:00
Mysticate a049d7666f Merge remote-tracking branch 'origin/master' into monster-maze 2015-10-13 22:14:19 -04:00
Cheese 45cd2a38e1 admins can botspam 2015-10-14 11:55:59 +11:00
Shaun Bennett 88709f85b6 Merge with master 2015-10-13 18:13:01 -04:00
Shaun Bennett cb0d82174e Apply botspam to chat messages as well 2015-10-13 17:41:25 -04:00
Cheese 1842eae7f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-13 23:22:58 +11:00
Cheese d105ea5d7e botspam addition 2015-10-13 23:19:48 +11:00
libraryaddict 58a86c5abb That's the easy stuff done.. 2015-10-13 19:49:15 +13:00
Jonathan Williams a292fdb3c5 Added failsafe for ServerMonitor. 2015-10-12 22:26:24 -05:00
Cheese f5b80c941c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-13 11:58:27 +11:00
Cheese e8388437b6 botspam now checks for chat as well 2015-10-13 11:58:14 +11:00
Cheese 3e5ac58ae9 helpers! 2015-10-13 11:23:00 +11:00
Cheese 37639a413c fixed skill stuff 2015-10-13 11:22:10 +11:00
Mysticate be96842de5 Ultra 2015-10-12 17:02:34 -04:00
AlexTheCoder dceba51060 - Fix random blockhunt bug with mounts and infestor 2015-10-12 03:09:40 -04:00
AlexTheCoder bbb863ba92 - Merge conflict patch 2015-10-12 02:36:10 -04:00
Cheese 2b9a66e7b2 more ssm update 2015-10-12 16:32:23 +11:00
Shaun Bennett 1aecc9505c Add region to titan, new MOTD 2015-10-12 01:30:31 -04:00
AlexTheCoder bef942f6da Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-12 00:47:56 -04:00
Cheese 6a173073a4 added flag to projectiles 
work on cow kit
 2015-10-12 14:39:14 +11:00
libraryaddict dab258dcdd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Libraries/BungeeCord.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
	Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
 2015-10-12 16:22:52 +13:00
Mysticate 3eb36a6581 Prevented farming 2015-10-11 22:43:21 -04:00
Mysticate 2abf3edad4 Made items for titanic cosmetics dyes. 2015-10-11 22:29:26 -04:00
Mysticate b6d573a4d5 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-11 22:25:25 -04:00
Mysticate 7a4ccdf680 Bug fixes 2015-10-11 22:17:34 -04:00
Mysticate dda65b4c77 Fixed tnt exploding lobbies 2015-10-11 19:56:36 -04:00
Mysticate 20dd9c683b Merge remote-tracking branch 'origin/master' into monster-maze 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java

Changed the scoreboard a bit, added it to MPS.
 2015-10-11 10:52:45 -04:00
Mysticate 606937d227 Fixed flashbang glitch 2015-10-11 09:42:36 -04:00
Jonathan Williams e6485a9009 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 23:02:36 -06:00
Jonathan Williams 5866e0cce6 Reducing max connections for the DBPool to 3. 2015-10-10 23:02:08 -06:00
Cheese f23bf18928 adhering to mysts OCD 2015-10-11 14:50:57 +11:00
Cheese f3e2f3c145 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-11 14:48:17 +11:00
Cheese cb9e8f8e0b pumpkin smasher achievement 2015-10-11 14:48:02 +11:00
Mysticate 435e74225a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-10 23:35:33 -04:00
Mysticate 83d1e011fc Changes. 2015-10-10 23:33:54 -04:00
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
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 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
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
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
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
fooify c3b2c10934 FINALLY FIXED THIS MONSTER MAZE BUG :D 2015-09-29 19:14:18 -07: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
Mysticate 2d173a5be4 Fixed a jumper perk. 2015-09-28 21:03:58 -04:00
Shaun Bennett 14027b9780 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-09-28 21:03:00 -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
libraryaddict 1394df03e0 For now, set all boss battles games to spider 2015-09-25 16:43:53 +12: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
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
libraryaddict 34d535f153 Fix custom tags, improve Packet handling 2015-09-25 14:07:51 +12:00
libraryaddict fa30ba1e16 Fix a small issue with Future Disguises 2015-09-25 14:07:12 +12:00
libraryaddict e8725b38ab Colorize the messages for when a /game start fails 2015-09-25 14:06:35 +12: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
Ty Sayers 3a8fd18d2e Disable the ability to craft Fishing Rods. Fix bug where players could use the Blink or Flash skills to bypass borders on negative coordinate sides of the map and die to border control. Fix bug where players could open the enchantment table GUI and enchant items when shift clicking without an item. Fix bug where players couldn't place blocks on top of Anvils. Fix NPE bug with players clicking on Anvils while not holding an item. Fix bug where the '/c home' command cooldown was reset on a players death, allowing for abuse. Fix duplication bug where BlockToss could be exploited inside claims by throwing valuable blocks into water blocks. Fix bug where players could lose items to NPC shop inventories using inventory drag skills to drag items across open slots. Cap the member size of a clan to 20 and maximum available claim count to 8. 2015-09-22 15:28:06 -05: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 86420132ce Clan name->uuid changes 2015-09-21 20:05:16 -04:00
fooify 1f84907309 more changes to monstermaze 2015-09-20 07:40:24 -07:00
libraryaddict 452e8a9694 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-09-19 12:11:21 +12: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
Shaun Bennett 6a4c9061fa Supply drop, loot, small fixes 2015-09-17 22:19:45 -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