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

3002 Commits

Author SHA1 Message Date
Mini-Chiss ed1c7e2336 Master Builders initial push (dont worry jon it doesnt effect anything for the update!) 2015-04-30 18:20:35 -05:00
libraryaddict 5d36ddce3a Arcade: Close only non-player inventories at 5 seconds 2015-04-30 21:17:08 +12:00
libraryaddict 23ea7bbce4 Spectators: Set fire ticks to 0 on damage 2015-04-30 20:55:30 +12:00
Peter Miller 152f5d3046 Ditto previous commit... 2015-04-29 16:52:06 -04:00
Peter Miller 69d4d2dfdb Another try at build changes. 2015-04-29 16:47:06 -04:00
libraryaddict 33bbe96964 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards 2015-04-30 01:33:43 +12:00
libraryaddict 497550549b ResourcePackCode: Fixed the return to hub sender displaying the wrong message. Bad downloads are now sent back to hub. 2015-04-30 01:33:21 +12:00
libraryaddict c2b7001fcc Wizards: Current progress 2015-04-30 01:32:22 +12:00
Peter Miller 1e6084bfb2 Another compilation order change. 2015-04-28 10:31:25 -04:00
Peter Miller 93abe301c2 More compilation depedency changes. 2015-04-28 10:18:53 -04:00
Peter Miller 1dc9864e4c Added necessary libraries to compilation targets. 2015-04-28 10:00:12 -04:00
Peter Miller e1ddf55860 Adjusting build order of compile targets in common.xml. 2015-04-28 09:36:43 -04:00
Peter Miller e68e99d1f6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-28 09:25:05 -04:00
Peter Miller 0ce7f657e1 Added compilation targets for Arcade/Hub building with Ant. 2015-04-28 09:24:35 -04:00
Mini-Chiss 45b801ba81 hitbox changes 2015-04-27 19:21:33 -05:00
libraryaddict 1c1ab9bbe3 Throwing TNT: Fixed tnt not being movable from other inventories 2015-04-23 08:30:23 +12:00
Jonathan Williams ae1480fb1e Little bit of spacing fixed. 2015-04-21 23:36:33 -05:00
Jonathan Williams a662c93a92 Fix so 0.0.0.0 doesn't get selected for DNS rotation. 2015-04-21 23:36:12 -05:00
Jonathan Williams d8ed866ada Fix for duplicate names in db. 
Adjusted staff server whitelist and op list.
 2015-04-21 23:35:41 -05:00
libraryaddict 2aaa93e58f ResourcePack: Add constructors to GameType for resource pack urls, sorted the enum's by name 2015-04-22 05:38:32 +12:00
libraryaddict b29893ff60 Merge branch 'ResourcePack' into Wizards 2015-04-22 03:46:25 +12:00
libraryaddict 9f8fe3bf78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-04-22 03:45:59 +12:00
libraryaddict aeff6bf4b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-22 00:25:56 +12:00
Shaun Bennett 2b8137fc66 Merge remote-tracking branch 'origin/master' 2015-04-21 00:20:40 -04:00
libraryaddict 0196a5c359 Wizards: Latest changes by Chiss 2015-04-21 13:54:19 +12:00
Shaun Bennett 3dddd7112c Update MOTD to not use animation anymore (Bug fixed in 1.8.4!) 2015-04-20 17:16:57 -04:00
Cheese c73a6ae62f champs balance 2015-04-19 13:49:46 +10:00
Cheese f4a91455f6 Champions Balance 2015-04-19 12:22:51 +10:00
libraryaddict cd47da179a Wizards: Added new food Cheese, removed other foods and raised spawn chance of remaining 2015-04-18 06:12:34 +12:00
libraryaddict 9db8aff37a Wizards: Changed spell icons for resource pack 2015-04-18 06:10:23 +12:00
Cheese 91a70d6a04 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-16 21:06:19 +10:00
Cheese b352b28fdc fixed MAC still being disabled 2015-04-16 21:05:56 +10:00
libraryaddict 25dfeacb09 Wizards: Spell levels are now viewable on items in chest as item amount 2015-04-16 16:20:01 +12:00
libraryaddict 8803941bd8 Wizards: More changes as per demand. 2015-04-16 05:51:08 +12:00
Jonathan Williams 99436b4a42 Added Tab event back :D 2015-04-14 02:01:04 -05:00
Jonathan Williams 556a9df945 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-14 01:59:59 -05:00
Jonathan Williams c454973398 Changed login deets for new new db cluster. 2015-04-14 01:59:29 -05:00
Jonathan Williams eea4b98069 Removed unused AccountManager.java 2015-04-14 01:59:09 -05:00
Cheese f7ef44b007 More hitbox nerfs 2015-04-14 16:43:02 +10:00
Cheese 6cc18b61d1 reduced hitbox on flesh hook and lightning orb 2015-04-14 16:38:11 +10:00
Jonathan Williams 3d6dce24ff Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-14 01:32:11 -05:00
Jonathan Williams e3a328c70d Revert "Work on FriendRepository, still not enabled yet." 
This reverts commit 405d0fec18.

Re-enabled friends.
 2015-04-14 01:32:03 -05:00
Cheese 058e5b9045 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-14 09:44:58 +10:00
Cheese 482ee6eb79 changed builder rank name 2015-04-14 09:35:35 +10:00
libraryaddict 073c7d16c2 Wizards Napalm: Make glazed blocks more common, raise damage 2015-04-13 15:06:52 +12:00
libraryaddict e0b0975195 Bridge: Prevent hoppers being crafted to prevent abuse 2015-04-13 14:38:32 +12:00
libraryaddict c36c800bb5 AchievementManager: Add SnrMod as a min MP level of 15 2015-04-13 14:05:50 +12:00
libraryaddict 12b3a582b2 CustomExplosion: Fixed loop, added max damage 2015-04-12 23:21:19 +12:00
libraryaddict be21968805 UtilBlock: Added a method that may or may not tell you the blocks destroyed in an explosion 2015-04-12 23:20:52 +12:00
libraryaddict 03fb8c203e Wizards: Balancing 2015-04-12 23:20:15 +12:00
libraryaddict 81aeff86bf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-12 20:15:28 +12:00
Cheese d290078790 Damage multipliers now effect damage modifiers - this also fixes a bug! 2015-04-11 16:33:18 +10:00
Cheese 1378dcb815 Properly fixed MS spec bug 2015-04-11 11:45:27 +10:00
Cheese 9b2c4662c3 fixed minestrike bug where newly joined specs could buy/drop items 
removed easter baskets
 2015-04-11 11:25:25 +10:00
libraryaddict afa372dca7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java
 2015-04-11 12:20:29 +12:00
libraryaddict 43163cd7d7 UtilParticle: Added lore for future reference on colored particles. 2015-04-11 12:14:12 +12:00
libraryaddict 28d0e28607 UtilShapes: Fixed getting BlockFace's being bugged and weird sometimes, added another method to get diagonal faces between two diagonals 2015-04-11 12:13:37 +12:00
libraryaddict 2d59bb4010 CustomExplosion: Added option to limit falling blocks that spawn, removed 'Reason' to prevent CustomDamageEvent from using a mod instead of initialDamage (wtf?) 2015-04-11 12:12:47 +12:00
libraryaddict fc7c6e5831 Wizards changes 2015-04-11 12:11:50 +12:00
Jonathan Williams 49431da509 Fix for pulling account UUID with multiple. 2015-04-10 10:53:11 -05:00
Cheese 3d95a5cfa4 bloock toss fix 2015-04-10 14:09:21 +10:00
Cheese 85c9f9010e Added Twitch Rank 
fixes hitbox on glacial
 2015-04-10 13:11:02 +10:00
Cheese c3798834c3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-07 08:30:45 +10:00
Cheese 18ba446764 re-enabled MAC 2015-04-07 08:30:32 +10:00
Jonathan Williams 9f6a89bfc6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-06 04:14:12 -07:00
Jonathan Williams 679d5faa9b Motd pull on start. 2015-04-06 04:14:04 -07:00
Jonathan Williams 4eb1f67d82 Removed code to set default motd. 2015-04-06 04:13:13 -07:00
Cheese e0a58ba165 champions exploit fix update 2015-04-06 19:57:33 +10:00
Cheese cdb86d3ebb champions exploit fixes and balance 2015-04-06 17:17:36 +10:00
Cheese 6c3fc3009b fixed sheep quest bug where players were unable to pick up sheep rapidly 
fixed bug where falling blocks were instantly hitting players
 2015-04-06 13:03:59 +10:00
Jonathan Williams 782db26d10 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-04 01:27:08 -07:00
Cheese 93abca0c01 can no logner break levers and other usables in SG 2015-04-04 16:12:33 +11:00
Cheese db1a3afa19 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-04 16:02:24 +11:00
Cheese dc84621b6c blizzard snowballs expire 2015-04-04 16:01:48 +11:00
libraryaddict 9518d9f438 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-04-04 17:33:51 +13:00
libraryaddict c1c4e8b417 Disguises: Fixed DisguisePlayer not using a random UUID to prevent conflicts, fixed non-player living entities not being disguisable 2015-04-04 17:33:33 +13:00
Cheese c79432c8b9 Fixed projectile hitboxes and specific values 2015-04-04 10:54:03 +11:00
Jonathan Williams d25b39058a Fixed bunny morph name. 2015-04-03 04:19:48 -07:00
Cheese ae298644e2 removed random egg color, looked ugly 2015-04-03 22:02:22 +11:00
Cheese 3cadbf3a34 fixed color in egg 2015-04-03 22:00:54 +11:00
Cheese f87511331e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-03 21:47:57 +11:00
Cheese ff0883e7d7 fixed easter egg duration 
parser list improvement
 2015-04-03 21:47:43 +11:00
Jonathan Williams 8567701e1d Updated Motd. 2015-04-03 03:20:11 -07:00
Jonathan Williams 0119e99adf Added EasterBunny package for support server. 2015-04-03 03:07:49 -07:00
Jonathan Williams 726c03af58 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-03 03:00:21 -07:00
Cheese 54948cc61e disabled rabbit buying 2015-04-03 20:59:56 +11:00
Jonathan Williams 158cc0909b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-03 02:37:46 -07:00
Cheese 23df6daab0 Added Easter Morph 
Added Eggs Baskets in games
Added double gem for 1.8
 2015-04-03 20:31:23 +11:00
Jonathan Williams c4de261b69 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-03 02:21:11 -07:00
Jonathan Williams aa089314f0 Completely removed Testing group from dead checks and laggy checks in server monitor. 2015-04-03 01:56:36 -07:00
libraryaddict 66c83397e5 DisguiseManager: Add DisguiseRabbit 2015-04-03 20:52:09 +13:00
Jonathan Williams a8aab1fea0 Motd changes. 2015-04-02 23:38:29 -07:00
Jonathan Williams 120420d35f Really fixed disguise memory leak this time. 2015-04-02 23:37:43 -07:00
libraryaddict 23abf92722 IcePathData: Compare Material instead of integers 2015-04-03 19:37:27 +13:00
Jonathan Williams fb4be35dfe Let admins apply youtube rank. 
Limit Lobby count to 250.
 2015-04-02 23:36:54 -07:00
libraryaddict 290767c58d CustomExplosion: Added method to change to customdamage, added method to change the block damage differently from the entity damage 2015-04-03 19:36:47 +13:00
Jonathan Williams 437c70e548 Fixed issue with double run() call in loadClientByName. 2015-04-02 23:36:16 -07:00
libraryaddict d5137d9ec6 UtilParticle: Added option to send own particle strings, added two particles 2015-04-03 19:35:57 +13:00
libraryaddict 05319511ff UtilBlock: Modified getInRadius() to allow option of a hollow sphere 2015-04-03 19:34:24 +13:00
libraryaddict 6faf5011a8 Wizards: Add spells: Gust, RainbowPath, SpectralArrow, IcePrison. Remove spells: ExplosiveRune, HealingRune, LaunchRune, Launch, TeleportRune. Explosions now launch blocks. Other changes done such as modified spells. 2015-04-03 19:33:49 +13:00
Cheese d4e8c0c9a6 Added Respawn middle screen text 
Added Champs capture point mid screen text
Fixed hitbox mults for projectiles
Fixed inconsistent arrow damage
Lots of Champions balance
 2015-04-03 15:28:10 +11:00
Cheese f682bb8f9c fixed kit items not spawning 
horse pet doesnt spawn when dead
 2015-04-03 12:10:02 +11:00
libraryaddict bb821996b1 Wizard modifications 2015-04-03 09:22:31 +13:00
Jonathan Williams 7a0f9d28bf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-01 02:22:58 -07:00
Cheese 43c58bd31c removed april fools from arcade :( 2015-04-01 20:22:13 +11:00
Jonathan Williams 24e65e7384 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-01 01:29:05 -07:00
Cheese 3355d2b457 disabled aprilfools cow for team games 2015-04-01 19:15:11 +11:00
Jonathan Williams 686f99031b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-01 00:26:30 -07:00
Cheese 5737df8d6a final fixes for bacon brawl 2015-04-01 18:07:45 +11:00
Jonathan Williams 8d9d298f0f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-01 00:04:44 -07:00
Cheese 987bf266ee fixed bug in moo 2015-04-01 18:02:56 +11:00
Cheese da9e7892f0 fixed aprilfools bugs 
mamapig debug :(
 2015-04-01 18:01:09 +11:00
Cheese 24ba42cb16 fixed armor stands blocking attacks in bacon brawl 2015-04-01 17:49:49 +11:00
Jonathan Williams 38798d3baf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-31 23:47:27 -07:00
Jonathan Williams 6037da6e0f Improved fix for coinQueue memory leak. 2015-03-31 23:47:08 -07:00
Jonathan Williams 405d0fec18 Work on FriendRepository, still not enabled yet. 2015-03-31 23:46:43 -07:00
Cheese 8bd883cb26 fixed damage transfer for mama pigglez kit 2015-04-01 17:43:46 +11:00
Cheese 31ddeaac50 a little more moo 2015-04-01 17:28:05 +11:00
Jonathan Williams 10c7d06a88 Memory leak fixes for DisguiseManager and DonationManager. 2015-03-31 23:16:15 -07:00
Cheese 59fce1cd88 adding some mmoooo text 
changed pig kit for baconbrawl
 2015-04-01 17:15:56 +11:00
Cheese ed35d2a992 April Fools update 2015-04-01 16:56:13 +11:00
Shaun Bennett 50c38dc467 April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA 2015-03-31 17:22:50 -04:00
libraryaddict b84756ef7a Revert wizard commits 2015-03-27 22:13:50 +13:00
libraryaddict a772d4cbf2 BlockHunt: Use new setInvisible method in DisguiseChicken 2015-03-27 22:05:16 +13:00
libraryaddict a27e6fba5c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-27 06:00:14 +13:00
Cheese 821c7f0cb6 Replaced bebe piggles kit with a new kit 2015-03-26 17:43:22 +11:00
Cheese e3eda38c2c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-26 10:10:11 +11:00
Cheese 6ab03e95ec more timings for visman 2015-03-26 10:08:41 +11:00
Jonathan Williams f4061854cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-25 15:11:17 -07:00
Jonathan Williams 6472194d44 Optimized queries to retrieve and update player information by removing inner join calls on the account. 
Added account id retrieval on login.
Added account id caching in redis.
 2015-03-25 15:10:59 -07:00
Jonathan Williams 294041b821 Removed Missing Coin application functionality from CustomerSupport server. 2015-03-25 15:05:06 -07:00
Jonathan Williams 09fe3ad6a8 NewsManager : Reduced dynamic string generation every time news changes 2015-03-25 15:04:00 -07:00
Jonathan Williams 589d4b1aae CoreClientManager accessible to public in MiniDbClientPlugin now. 2015-03-25 15:03:08 -07:00
Jonathan Williams 16c41aba82 Retrofitted BungeeRotator to updating IP information. 2015-03-25 15:02:14 -07:00
Jonathan Williams 6c72bc2c36 Added playerStats caching via redis. 
Fixed MotdManager's forced hardcoded motd.
 2015-03-25 15:01:19 -07:00
Jonathan Williams a8eaf1014f Updated EnjinTranslator to new backend processing. 2015-03-25 15:00:27 -07:00
libraryaddict d3e37d4578 CustomExplosion & explosion/Explosion.java: Add option to use falling block explosions on CustomExplosion by option in Explosion to only spawn falling blocks, not remove blocks so that CustomExplosion can handle that 2015-03-25 20:32:03 +13:00
libraryaddict 2d4dcdbd8e CustomExplosion: Add method to change block explosion size separately 2015-03-25 19:26:25 +13:00
libraryaddict db5e6ad745 Wizards: Summoned wolves are one-hittable, and one per spell level 2015-03-25 19:25:32 +13:00
libraryaddict be5086e2a5 Wizards: Give warning before lightning spell hits 2015-03-25 19:22:08 +13:00
libraryaddict be542b9ce4 Rebalance wizard spell SpeedBoost 2015-03-25 19:21:38 +13:00
libraryaddict 853e6420dd Add instant-casting to wizards 2015-03-25 19:21:20 +13:00
Cheese 4a25265c7c Added utility methods to check for players within a sight pyramid 2015-03-25 17:13:22 +11:00
libraryaddict 4988b90d0e Prevent TNT from being moved in inventories in PerkBomberHG 2015-03-25 16:56:37 +13:00
libraryaddict 63c55a1449 SurvivalGames: Prevent wood dropping, add mushroom soup to base loot and change bowl to soup. Add throwing tnt to loot. 2015-03-25 16:56:05 +13:00
libraryaddict ad967a092a Remove TNT from SG placeable and breakable 2015-03-25 16:19:56 +13:00
Cheese 9142227dd4 updates to SG border 
balanced cleave for SG and Champs
 2015-03-25 14:16:09 +11:00
Cheese 80d350ff85 fixed timedata not storing title 2015-03-23 17:22:11 +11:00
Cheese 4bcdb561be one more timing 2015-03-23 16:40:59 +11:00
Cheese 5fded981d9 Timings for Visibility 2015-03-23 16:38:17 +11:00