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

3311 Commits

Author SHA1 Message Date
Jonathan Williams
d161d62773 Added chat filtering to private messages. 2015-04-30 23:56:08 -05:00
Jonathan Williams
b33828f5a1 Added LibraryAddict's crash exploit patch for craftbukkit.jar 2015-04-30 23:48:58 -05:00
Mini-Chiss
21800d83c6 Build fixes 2015-04-30 23:16:30 -05:00
libraryaddict
319cde5c46 Wizards: Update resource pack url 2015-05-01 16:14:59 +12:00
libraryaddict
fbafeca150 Wizards: Remove block burn flag true 2015-05-01 15:44:11 +12:00
libraryaddict
82cd4208bd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
 2015-05-01 14:22:53 +12:00
libraryaddict
c660e0e3c7 Wizards: Re-sorted spells 2015-05-01 14:19:13 +12:00
libraryaddict
7bd133f704 Wizards: Temporary resource pack 2015-05-01 13:04:05 +12:00
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
Shaun Bennett
5c6c4a23d5 Rename SDK to 1.8 instead of 1.7 (IDEA) 2015-04-21 20:10:01 -04: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
Cheese
46dfb532fb Bridges scoreboard fix 
SG balance
DONT QUIT msg improvement
 2015-03-23 11:50:09 +11:00
libraryaddict
510b6bcf80 Add optional checks to UtilInv.contains and UtilInv.getItems for cursor and armor items. 2015-03-23 13:13:16 +13:00
libraryaddict
c48dad8eeb UtilInv.contains() no longer loops through inventory contents, but uses getItems(player) which gets armor, inventory and cursor itemstack. 2015-03-23 13:06:19 +13:00
Cheese
3f2b7444a3 made SG scoreboard display individual player names once there's less then 8 2015-03-22 10:06:11 +11:00
libraryaddict
f99edecba0 Change deathmatch color to red 2015-03-22 00:05:24 +13:00
Cheese
f45bb80ac2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-21 12:23:02 +11:00
Cheese
2bbf035d4c SG borders now have audio and attack nearby players. 2015-03-21 12:22:47 +11:00
Jonathan Williams
4b81f6cd8b Fixed Memory leak with lastState in VisibilityData 2015-03-20 09:05:25 -07:00
Jonathan Williams
ef0d8a2813 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-20 08:20:53 -07:00
Cheese
6a68dc6b24 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-20 23:48:30 +11:00
Cheese
28b3828007 slowed hub invis update 2015-03-20 23:48:17 +11:00
libraryaddict
c4edfa8263 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-21 01:38:37 +13:00
libraryaddict
ee7ae77311 Use VisibilityManager instead of hidePlayer showPlayer in SG Deathmatch 2015-03-21 01:38:20 +13:00
Jonathan Williams
070cc729de Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-20 05:31:43 -07:00
Cheese
f54ed0ece2 visibility fix 2015-03-20 23:20:56 +11:00
Cheese
0a766cd7bb increased food and weapons 2015-03-20 22:23:25 +11:00
Jonathan Williams
73e6c555f7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-20 03:16:25 -07:00
Cheese
376824edfc slowly tnt explosion by 0.5s 2015-03-20 20:46:11 +11:00
Cheese
446951d8af balance changes for SG 2015-03-20 20:43:42 +11:00
Cheese
57502c226f changed slasher to barb 2015-03-20 19:39:23 +11:00
Cheese
392a648f8e fixed cleave hurting self 2015-03-20 18:43:44 +11:00
Cheese
810517b142 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-20 18:22:10 +11:00
Cheese
cdd9400ec2 added slasher kit to SG 2015-03-20 18:21:56 +11:00
libraryaddict
f2ffc57ae2 Fix error, allow snowball and egg to do damage 2015-03-20 20:15:10 +13:00
libraryaddict
baaebd3662 Chiss wants a shorter Assassin Description 2015-03-20 19:43:27 +13:00
libraryaddict
11dcc4af8b Fix description of Assassin Kit 2015-03-20 19:41:56 +13:00
libraryaddict
83b18129f2 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-20 19:33:27 +13:00
libraryaddict
7bf9c13fd8 Kit Assassin in SG has nametag visiblity set to 8 blocks, normal set to 24 2015-03-20 19:30:08 +13:00
Cheese
6c78bc6f8f added 10s delay on getting bow in block hunt 2015-03-20 16:51:24 +11:00
Cheese
746fa9e11b stealer kit for SG 2015-03-20 16:20:55 +11:00
libraryaddict
6c257c1e7d Store killed players in a hashmap in SG 2015-03-20 18:17:34 +13:00
libraryaddict
19cc6dc12b Minor bug-fix in the hopes it fixes a major bug for SG 2015-03-20 17:51:03 +13:00
libraryaddict
6e30834565 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-20 17:35:42 +13:00
libraryaddict
03bcb120fc Change border damage from Void to Border Damage 2015-03-20 17:35:27 +13:00
libraryaddict
3e7346618b Change border creep speed, boats only placeable on water 2015-03-20 17:34:44 +13:00
Cheese
e4475eb7b1 allowed mapleads to stop games 
removed nametag (long range) on wolf pet, and lowered damage from 4 to 3
 2015-03-20 12:37:18 +11:00
libraryaddict
7b41649d94 Removed debug logging in SurvivalGames 2015-03-18 22:10:03 +13:00
Jonathan Williams
3e17638bf0 Customer support re-add Dooskee. 2015-03-17 16:22:18 -07:00
Cheese
ee237c9f5b re-enabled SG in gamefactory 2015-03-17 22:20:40 +11:00
libraryaddict
1f0e204eb3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
 2015-03-18 00:04:41 +13:00
libraryaddict
261b18fcf0 Add GameType options 2015-03-17 23:59:59 +13:00
libraryaddict
52f0941fb9 Add resourcepack options 2015-03-17 23:59:24 +13:00
libraryaddict
733134f709 Update SurvivalGames 2015-03-17 23:53:43 +13:00
libraryaddict
f12d0bf9ef Allow disabling of game start sounds, and changing of the game PrepareTime. 2015-03-17 23:52:58 +13:00
libraryaddict
340441edbe SG kit fletcher no longer can pickup fletched arrows 2015-03-17 18:30:48 +13:00
libraryaddict
06ebbbbc73 Remove SG wolf pet on quit 2015-03-17 18:30:17 +13:00
libraryaddict
ec30269a14 Add new loot classes to manage loot 2015-03-17 18:08:47 +13:00
libraryaddict
41469b198a Change wizards spells to use conditions for potion effects 2015-03-17 18:07:43 +13:00
libraryaddict
03d77abed3 Don't allow people holding gold ingots to deal a lot of damage 2015-03-17 17:49:10 +13:00
libraryaddict
921deb5270 Update disguises for 1.8, add sleeping ability to player disguises 2015-03-17 17:48:29 +13:00
libraryaddict
65a9073c69 Add border packet and resource pack status packet. Add ability to listen to incoming packet Use Entity 2015-03-17 17:42:16 +13:00
Cheese
3eba559b01 fixed merge error 2015-03-17 15:02:41 +11:00
Cheese
73c66fa93f Merge branch 'SpecRemoveCreative' 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-17 14:57:17 +11:00
Cheese
e3eb62887d fixed an eventgame bug 2015-03-17 14:50:56 +11:00
Cheese
44e887ec61 fixed give command to properly assign item data 2015-03-17 12:06:41 +11:00
Cheese
28c683a37a fixed display for effects 2015-03-16 15:16:17 +11:00
Cheese
b3320d7cbe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-16 15:01:48 +11:00
Cheese
c941c383e7 fixed hosts not being able to use creative inventroy 2015-03-16 15:01:35 +11:00
Jonathan Williams
2dade32499 Added support for creating Event servers. 2015-03-15 20:50:54 -07:00
Jonathan Williams
8a027872aa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-15 20:50:14 -07:00
Cheese
efa2b649bd updated eventserver not expiring 2015-03-16 14:19:43 +11:00
Cheese
a700b61613 added WE permissions to event servers. 2015-03-16 14:10:58 +11:00
Cheese
4581f49948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-16 13:39:54 +11:00
Cheese
420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
Jonathan Williams
d1bc6e4567 Updated EnjinTranslator. 2015-03-15 19:30:37 -07:00
Jonathan Williams
eca5651d83 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-15 19:29:06 -07:00
Jonathan Williams
4d557cb392 Code to improve stat recording, commented out for now. 2015-03-15 19:28:58 -07:00
Jonathan Williams
de780ae2f0 Some geolocation call test code. 2015-03-15 19:28:38 -07:00
Ty Sayers
cec6cf9b2d Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-03-15 13:00:23 -04:00
Ty Sayers
8279f0b17a Add missing PlayerStatus object to ServerData for cross-server player tracking. 2015-03-15 13:00:15 -04:00
Jonathan Williams
4b878c5f27 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-15 04:48:01 -07:00
Jonathan Williams
fcbac70deb Tweaked DB Pool settings, increased connections to 4. 
Disabled Friend and Leaderboard for now.
 2015-03-15 04:47:53 -07:00
libraryaddict
bead4a7626 No longer need to constantly set the durability of items in the sheep game 2015-03-15 13:13:06 +13:00
libraryaddict
db7def2980 Add relative teleports to /teleport command 2015-03-15 12:42:29 +13:00
libraryaddict
f4b6a53adb Add Wither to ConditionFactory 2015-03-15 12:36:18 +13:00
libraryaddict
ba04c5e834 Fixed GameScoreboard demanding strings are shortened to 15 chars when the max is 16 2015-03-15 12:35:39 +13:00
libraryaddict
e9fe1fb423 Formatted SpellType, fixed lightning spell description 2015-03-15 12:34:45 +13:00
libraryaddict
18094fea9b Change UtilPlayer.sendPacket(Packet) to UtilPlayer.sendPacket(Packet...) 2015-03-15 12:32:59 +13:00
libraryaddict
503106892d Fixed UtilTime for displaying decimals when trimmed 2015-03-15 12:32:42 +13:00
libraryaddict
20a51ee7fc Change Blood to unstackable items 2015-03-15 12:30:42 +13:00
libraryaddict
e1c284722e Add method getEntityById to UtilEnt 2015-03-15 12:28:17 +13:00
Ty Sayers
7811279b26 Convert friend system over to redis-based PlayerStatus data tracking from old SQL storage. 2015-03-14 17:41:16 -04:00
Jonathan Williams
c1c284002d Fixed JREs for Mineplexer and BungeeRotator. 
Added a little more info on debug for BungeeRotator.
 2015-03-14 06:21:04 -07:00
Jonathan Williams
d38a28981b Fixed NPE when type /friend with a space after it. 2015-03-14 06:20:33 -07:00
Jonathan Williams
a002769ac0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-13 22:53:46 -07:00
Ty Sayers
ffedc82785 Commit leftover package that was not committed from previous re-organization. 2015-03-14 01:52:37 -04:00
Jonathan Williams
b6a8b4cee3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-13 22:45:48 -07:00
Ty Sayers
af898e3306 Convert PlayerStatus trackers, Bungee MOTD, and Bungee Server status' from MySQL storage to redis-based system using DataRepository's. 
Re-organize structure of ServerData packaging.
 2015-03-14 01:03:22 -04:00
Jonathan Williams
a93a14c3c1 Changed DefaultTransactionIsolation so entire tables aren't locked every query. 
Decreased DBPool down to 3 connections per server.
 2015-03-13 20:16:37 -07:00
Jonathan Williams
de9c861df2 Disabled bungee status history. 2015-03-13 18:11:06 -07:00
Jonathan Williams
c157df8fd0 Added debug functionality to BungeeRotator. 2015-03-13 18:10:53 -07:00
Jonathan Williams
d8867711ef Fix bug with PlayerCount. 2015-03-13 18:10:35 -07:00
Jonathan Williams
cb93769e03 Converted Bungee to redis. 
Increased DBPool maximum connections to 5.
 2015-03-13 17:53:36 -07:00
Jonathan Williams
838df3f57a Added UUID lookup for saveRank call. 2015-03-13 17:52:25 -07:00
Jonathan Williams
4017ec95c0 Ignore Testing groups in server monitor. 2015-03-13 03:21:50 -07:00
Jonathan Williams
28f73704e5 Improved party lookup for server transfers. 
Always transfer party if leader transfers servers.
 2015-03-13 00:10:29 -07:00
Cheese
98960b6ce7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-13 15:40:41 +11:00
Cheese
6762e4b537 Merge branch 'SpecRemoveCreative' of ssh://184.154.0.242:7999/min/Mineplex into SpecRemoveCreative 2015-03-13 11:34:57 +11:00
Cheese
c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11:00
Jonathan Williams
e776a9f886 Added new customer support agents to StaffServer 2015-03-12 15:32:35 -07:00
Jonathan Williams
b1ffe4d07b Re-enabled target server check. 2015-03-12 15:32:22 -07:00
Ty Sayers
f812243185 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-03-12 18:20:08 -04:00
Ty Sayers
33ff7f8e50 Convert leaderboard stat events to insert into the repository using asynchronous task calls. 2015-03-12 18:19:58 -04:00
Shaun Bennett
b18ea22df4 Fix spectator gui bug 2015-03-12 15:50:46 -04:00
Jonathan Williams
6394b588ab Re-enabled cross-server functionality. 
RedisPartyHandler execution is now run on Bukkit main thread.
 2015-03-12 04:10:15 -07:00
Jonathan Williams
ca9ebbb1bd Updated NoCheatPlus.jar - Removed VehicleExit check because we don't use and we altered the event. 
It spammed consoles when people dismounted from non-vehicles.
 2015-03-12 04:09:38 -07:00
Cheese
3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Jonathan Williams
98b14c9c7e Fixed Clans repository so it uses the pool. 2015-03-11 19:20:42 -07:00
Shaun Bennett
7fd08c6b7b Merge remote-tracking branch 'origin/master' 2015-03-11 22:18:50 -04:00
Shaun Bennett
f660620e4b Revert "Pre-Frost changes" 
This reverts commit dbeea5bf69.
 2015-03-11 22:18:29 -04:00
Ty Sayers
468f354422 Add fifth slave instance to port 6382. 2015-03-11 22:08:32 -04:00
Ty Sayers
b7a4dd775c Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-03-11 21:52:57 -04:00
Ty Sayers
9788436700 Convert cross-server commands to utilize master-slave redis instances rather than a stand-alone instance. 
Add new slave instance on port 6377.
 2015-03-11 21:42:52 -04:00
Jonathan Williams
23de2f735d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-11 18:31:29 -07:00
Jonathan Williams
bf87cfd0cd Merge remote-tracking branch 'remotes/origin/sql_pooling' 2015-03-11 18:30:52 -07:00
Cheese
bf901b2280 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-12 12:15:48 +11:00
Cheese
8e77d1fc21 more event server updates 2015-03-12 12:14:49 +11:00
Jonathan Williams
626bfc35fc Revert "Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections."" 
This reverts commit 215ec7b00d.

Enabled multi-queries on db pool.
Cleaned up some code using new pooling getConnection inappropriately
 2015-03-11 18:05:13 -07:00
Jonathan Williams
0b2ce48b3e Fix dead lobbies bug. 2015-03-11 17:27:21 -07:00
Jonathan Williams
a955526adf Disabled double gems. 2015-03-11 17:24:03 -07:00
Jonathan Williams
1ab43c9f44 Added new support agent to whitelist for customer support server. 2015-03-11 17:23:48 -07:00
Jonathan Williams
4db745c1e5 Added Version and IP logging for Bungees. 2015-03-11 17:23:23 -07:00
libraryaddict
9cf0e4d1e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-11 13:17:16 +13:00
libraryaddict
f47447134e Cleanup hologram class, remove witherskull option for 1.8 and fix duplicate nametags and non-invisibility on armorstands 2015-03-11 13:16:00 +13:00
Tim Ziankoski
759db08679 Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex" 
This reverts commit 2e06a272b4, reversing
changes made to e443b41e15.
 2015-03-09 17:24:01 -04:00
Tim Ziankoski
2e06a272b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-09 16:43:00 -04:00
Cheese
e443b41e15 removed unfinished code 2015-03-09 22:16:08 +11:00
Cheese
16a8fbe088 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-09 22:15:38 +11:00
Cheese
3a0e597276 more event server stuff 2015-03-09 22:15:24 +11:00
Jonathan Williams
6614f83579 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-08 20:01:58 -07:00
Ty Sayers
7dbf970df7 Add support for multiple slave connections for load balancing. 2015-03-08 19:17:28 -04:00
Jonathan Williams
fbe6b294cb Removed redis logging. 2015-03-08 13:51:31 -07:00
Jonathan Williams
72ca1005b3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-08 13:48:52 -07:00
Jonathan Williams
27c17eccfb Disabled redis pub commands. 
Added getServerStatusesByPrefix to redis.
Increased timeout for servers.

Turned on DoubleGemWeekend
 2015-03-08 13:47:49 -07:00
Ty Sayers
2b74e774f1 Redirect ServerCommand PubSub connections to standalone redis instance to distribute load. 2015-03-08 16:46:35 -04:00
libraryaddict
dbeea5bf69 Pre-Frost changes 2015-03-09 05:17:04 +13:00
Jonathan Williams
8cc60e1b65 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-07 21:49:37 -08:00
Jonathan Williams
579ac8171d Hard-coded UUIDs for Staff Server to prevent UUID lookup Rate limits 2015-03-07 21:48:51 -08:00
Jonathan Williams
bd8c101901 Slowed down interval for pulling servers on bungees. 2015-03-07 21:48:15 -08:00
Jonathan Williams
14da350b16 Removed unnecessary Windows DB call for Pet Factory. 2015-03-07 21:47:48 -08:00
Jonathan Williams
521891f409 Updated BungeeRotator to reflect new API key and abide by new rate limits. 2015-03-07 21:47:02 -08:00
Ty Sayers
4237cd082c Add support for master-slave replication in redis to balance load of read and writes. Redis based repositories now read/write to specified connection pools (master or slave). 2015-03-07 23:19:35 -05:00
Tim Ziankoski
ac4b495301 Created internationalization helper class and began i18n process 2015-03-07 20:50:47 -05:00
Ty Sayers
215ec7b00d Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections." 
This reverts commit adfe5fb74e.
 2015-03-07 19:38:06 -05:00
Ty Sayers
adfe5fb74e Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections. 2015-03-07 19:36:54 -05:00
Cheese
e0ba667613 old chests drop a little more frequently 2015-03-07 11:53:18 +11:00
Cheese
480a5225f3 increased coin loot from rare chest drops 2015-03-07 11:49:01 +11:00
Cheese
f2a71b2ea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-07 11:13:30 +11:00
Cheese
683f86bd89 event server fixes and parser gamtypes 2015-03-07 11:13:17 +11:00
Jonathan Williams
90dbd64b17 Added closes to connections in RepositoryBase that use DataSource. 2015-03-06 04:12:46 -08:00
Jonathan Williams
c15c6e2dd8 Removed threading for ServerCommandManager 
Removed target server check (some commands are broadcasted)

Disabled Message/Party crossserver listeners.
 2015-03-06 04:12:11 -08:00
Jonathan Williams
2d7f65588c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-06 01:36:38 -08:00
Jonathan Williams
09ecb994f6 Pooled Friend/Ignore/Preferences/Poll/Elo repositories. 
Removed ArcadeRepository as its unused.

Removed target server check for RedisCommand because it breaks other commands.
 2015-03-06 01:36:25 -08:00
Cheese
0336df55aa Event update 2015-03-06 19:43:17 +11:00
Cheese
e62d9774a9 Initial Event Game push 2015-03-06 19:11:26 +11:00
Jonathan Williams
5c738a2e3c Added two-strike system to NCP hooks. 2015-03-05 16:46:50 -08:00
Jonathan Williams
8ddce7cb32 Reduced process wait time per server kill/create 
Added kill bypass for first startup (network reset)

Fixed some log messages that weren't being logged.
 2015-03-02 13:42:34 -08:00
Jonathan Williams
3e27675d96 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-02 12:50:28 -08:00
Jonathan Williams
5e78b43860 Added StaffOnly code to ServerConfiguration 2015-03-02 12:33:04 -08:00
libraryaddict
c09a23f2bc Save MapParser's new world spawn location to 0,0 on creation 2015-03-02 03:45:26 +13:00
libraryaddict
d6c3b330b5 Fix redis working on the same thread 2015-03-02 03:44:38 +13:00
Jonathan Williams
789e750cbf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-01 01:09:28 -08:00
Jonathan Williams
5816da496d Adopted StaffServer project to refactors. 
Added default rank package for staff server.
 2015-03-01 01:09:22 -08:00
libraryaddict
1fbadfa4f4 Don't compare player world to a plugin fetched world, instead compare the name. 2015-03-01 18:18:53 +13:00
libraryaddict
26e6b66cf5 Fix staff server capitalization changes 2015-03-01 17:41:17 +13:00
libraryaddict
3f7eceb907 Disable redis being sent for player messaging and parties. 2015-03-01 17:40:52 +13:00
libraryaddict
3b4075392a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-01 15:16:15 +13:00
Jonathan Williams
e5189bea40 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-28 10:26:25 -08:00
Shaun Bennett
81a7e1f1f2 Better hover effect for treasure chests - also fixes hover only showing for old chests 2015-02-28 00:37:22 -05:00
Shaun Bennett
42600a0c70 Call direct methods in friends gui instead of running commands (prevents getting command spam errors when trying to mass add/delete friends) 2015-02-27 23:36:36 -05:00
Shaun Bennett
c916957a07 Fix block morph with treasure chests 2015-02-27 23:22:45 -05:00
Shaun Bennett
90ebbd9962 More refactors 2015-02-27 22:53:55 -05:00
libraryaddict
d23d146f35 Fix up admin message typos 2015-02-27 21:12:31 +13:00
libraryaddict
9802c00ec5 Add /spawn and /setspawn commands to MapParser 2015-02-26 21:40:09 +13:00
Shaun Bennett
efce714375 DEVP-66 Refactor commonly used classes to Java conventions 
Refactoring + testing jira
 2015-02-26 00:07:07 -05:00
libraryaddict
d9184ad423 Disable /a for muted players 2015-02-25 23:20:40 +13:00
Shaun Bennett
145bf98590 Add JIRA configuration for IntellIJ IDEA 2015-02-24 21:18:08 -05:00
Shaun Bennett
cf7e2eed69 Merge with MPS Update 2015-02-24 21:11:16 -05:00
Shaun Bennett
85ee98782e Revert "Move clans database calls to a seperate thread" 
This reverts commit 61b1e3f48b.
 2015-02-24 21:04:57 -05:00
Shaun Bennett
ad5481ef9c Revert "Remove arcade repository stuff" 
This reverts commit a5f7050e40.
 2015-02-24 21:04:19 -05:00
Shaun Bennett
45fd3cc537 Revert "Update JOOQ files, update IntelliJ config file for JIRA" 
This reverts commit db3f2989c0.
 2015-02-24 21:03:59 -05:00
libraryaddict
bfb0c157a2 Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths 2015-02-25 13:56:32 +13:00
Shaun Bennett
cea172a713 Give more cpu to SnrMod+/Youtube private servers 2015-02-24 17:39:02 -05:00
Shaun Bennett
be591c7d09 Disallow start/stop/kick/setgame while a game is in progress for Donor ranks 2015-02-24 17:22:47 -05:00
Shaun Bennett
857052992d Increase max player cap to 100 for SnrMod+/Youtube 2015-02-24 14:47:10 -05:00
Shaun Bennett
570374fbb4 Add Wither Assault and Wizards gametypes to legend+ private servers 2015-02-24 14:45:31 -05:00
Shaun Bennett
47ef3617f4 Give SnrMod+/Youtube servers 2GB of ram instead of 1GB 2015-02-24 14:43:38 -05:00
Shaun Bennett
48dd5639d2 Kick banned players from games 2015-02-24 14:38:12 -05:00
CoderTim
0bf6866ad7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-23 20:56:34 -05:00
libraryaddict
fc5771b33c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-24 13:04:06 +13:00
libraryaddict
56e03221ad Improve party system 2015-02-24 13:03:51 +13:00
Jonathan Williams
e1818a9c32 Fixed stat overrite bug. 2015-02-23 00:45:45 -08:00
Jonathan Williams
0a2e11e8bc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-20 23:56:24 -08:00
Jonathan Williams
87558eb01a Merge pull request #10 in MIN/mineplex from leaderboards_dev to master 
* commit 'e1f7e2dbcc91bb79d393b09ea5b250fe895cfe11':
  Remove old lines of debug code.
  Add in hooks to update statistical events log for leaderboards. Modify leaderboard PHP script for new updated leaderboard table formats.
 2015-02-21 01:55:59 -06:00
libraryaddict
53bb67ec4f Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits 2015-02-21 20:41:07 +13:00
Jonathan Williams
c02adc0232 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-20 23:29:44 -08:00
Jonathan Williams
e6eb938b96 Delayed whitelist additions. 2015-02-20 23:29:19 -08:00
Ty Sayers
e1f7e2dbcc Remove old lines of debug code. 2015-02-19 18:55:21 -05:00
Ty Sayers
def101cc8d Add in hooks to update statistical events log for leaderboards. 
Modify leaderboard PHP script for new updated leaderboard table formats.
 2015-02-19 18:53:46 -05:00
CoderTim
6a368454ec Clans database refactoring 2015-02-18 21:31:38 -05:00
CoderTim
aebe390c3c Refactored ClanRole enum 2015-02-18 19:56:29 -05:00
CoderTim
44f453c56e Updated jOOQ and database tables 2015-02-18 18:51:36 -05:00
libraryaddict
0aee8042b5 Changed /locate to return the located players name, not fed target 2015-02-18 09:27:58 +13:00
libraryaddict
d29b43d645 Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages. 2015-02-17 15:17:14 +13:00
libraryaddict
3b0a131ca2 If private messaging is turned off, deny messages, even from friends. 2015-02-15 22:10:15 +13:00
libraryaddict
3ef3689e6d Fixed RedisMessageCallback not being registered 2015-02-15 22:01:10 +13:00
Jonathan Williams
fd0547d9d3 Added connection re-establishment to database calls if error occurs. 2015-02-14 22:50:52 -08:00
Jonathan Williams
c129deb201 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-14 22:05:24 -08:00
Mini-Chiss
cdbf6c450e fixed mis-named gameloot chests 2015-02-15 17:35:58 +13:00
Jonathan Williams
17543910b5 Added Chest packages to support server. 
Fixed Punish not loading.
 2015-02-14 15:09:42 -08:00
Jonathan Williams
c50e79355f Added proper logging to BungeeRotator 2015-02-14 13:49:09 -08:00
Mini-Chiss
e33fd3f249 disallow people from talking about hacks in chat. 2015-02-15 09:01:55 +13:00
libraryaddict
0071d6220d Change locate command to moderators and up 2015-02-14 22:22:15 +13:00
Jonathan Williams
6ff0928fbd Fixed RB with exemption in NCP hooks. 2015-02-14 00:48:07 -08:00
Jonathan Williams
beac0b4828 Added try catch in BungeeRotator and ServerMonitor so they don't crash out. 2015-02-14 00:47:03 -08:00
Shaun Bennett
61b1e3f48b Move clans database calls to a seperate thread 2015-02-13 07:34:09 -05:00
Shaun Bennett
a5f7050e40 Remove arcade repository stuff 2015-02-13 07:33:50 -05:00
libraryaddict
0cd0c61200 Add /locate|where|find command to find other players in other servers 2015-02-13 20:57:46 +13:00
Shaun Bennett
db3f2989c0 Update JOOQ files, update IntelliJ config file for JIRA 2015-02-12 14:17:04 -05:00
libraryaddict
876005b3e3 Fixed sending admin cross-server messages not setting last admin to 2015-02-12 22:27:09 +13:00
libraryaddict
858a6fb674 Fixed FriendsGUI not removing ghost items when redrawing page 2015-02-12 04:08:43 +13:00
libraryaddict
9bdf248643 Add cross-server message and adminmessage commands. Fixed casing on messagecommands package. 2015-02-12 04:08:06 +13:00
libraryaddict
1b11c5dbbf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-12 04:06:19 +13:00
libraryaddict
f41473da8f Add message to unignore when no parameters are given 2015-02-11 23:11:21 +13:00
Jonathan Williams
6383cf7ce6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-02-10 18:17:13 -08:00
Shaun Bennett
1b4d1d94e9 Merge remote-tracking branch 'origin/master' 2015-02-10 21:15:53 -05:00
Shaun Bennett
58eaaaa2ee Treasure fixes 2015-02-10 21:15:44 -05:00
Jonathan Williams
86b0a578ba Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 18:13:49 -08:00
Mini-Chiss
264ecfc362 lowered legendary chance on old chest slightly 2015-02-11 15:13:33 +13:00
Jonathan Williams
f0d2ff1c9d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 17:44:36 -08:00
Mini-Chiss
500e37a618 fixed ender chest shop item 2015-02-11 14:44:14 +13:00
Mini-Chiss
92d3a7dab8 all chests purchasable by coins 2015-02-11 14:42:41 +13:00
Mini-Chiss
e03c65769d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-11 14:16:58 +13:00
Mini-Chiss
cafa59d7e8 adjusted reward rarities 2015-02-11 14:16:08 +13:00
Jonathan Williams
594f0c6045 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 17:15:06 -08:00
Shaun Bennett
e21e27f07f Merge remote-tracking branch 'origin/master' 2015-02-10 13:33:59 -05:00
Shaun Bennett
6b3f2114f2 Holy debug code! 2015-02-10 13:27:29 -05:00
Jonathan Williams
80a5acd9f2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 04:18:05 -08:00
libraryaddict
5a516e4c78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-11 00:59:45 +13:00
libraryaddict
77350e51de Using the wrong servername in PlayerTracker 2015-02-11 00:58:21 +13:00
Jonathan Williams
258c1ca7fc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 02:27:05 -08:00
Mini-Chiss
d9521bd05a lowered gameloot chances 2015-02-10 23:26:37 +13:00
Jonathan Williams
ff10d0cb06 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 02:22:57 -08:00
Jonathan Williams
246acc721a Clans compiles now ;) 2015-02-10 02:22:47 -08:00
Jonathan Williams
4c0e6642f4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 02:12:23 -08:00
Jonathan Williams
3a912c13ec Add nocheat to MPS 2015-02-10 02:11:27 -08:00
Mini-Chiss
01173a2e13 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 19:12:56 +13:00
Mini-Chiss
884df48695 disguise command (not yet working fully) 2015-02-10 19:08:54 +13:00
Shaun Bennett
336ba50f59 Rename some enum values for treasures, update my packet change 2015-02-09 23:24:43 -05:00
Mini-Chiss
cb9246281c TEASURE! +R 2015-02-10 16:49:50 +13:00
Mini-Chiss
37a5024fcd more chest polish 2015-02-10 13:22:42 +13:00
Mini-Chiss
04d0a1cba1 fixed lore 2015-02-10 12:40:51 +13:00
Mini-Chiss
edddff503e Treasure ready ;o 2015-02-10 12:38:08 +13:00
Mini-Chiss
c1f9f94c2a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 12:23:28 +13:00
Mini-Chiss
6bbf9bd321 Ability to purchase old chests 2015-02-10 12:23:11 +13:00
Mini-Chiss
af95d3ba4e Treasure update 2015-02-10 12:09:37 +13:00
libraryaddict
c2c63f4fc0 Null check in MessageManager 2015-02-10 04:17:38 +13:00
libraryaddict
29f3241098 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 02:32:13 +13:00
libraryaddict
ce7db289a7 Add commands /ignore and /unignore. Fixed mutes not working with private messaging 2015-02-10 02:31:33 +13:00
libraryaddict
cf0134a577 Change commandmanager to cancel event if command is registered, despite not having permissions 2015-02-10 02:20:54 +13:00
Jonathan Williams
51e1798d8a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-09 00:19:15 -08:00
Jonathan Williams
c5b7e97623 Added NoCheatPlus hooks. 2015-02-09 00:18:51 -08:00
Jonathan Williams
fb563c9274 Fixed customer support whitelist names. 2015-02-09 00:16:20 -08:00
Jonathan Williams
fcba1db291 Fixed server transfer bug. 2015-02-09 00:15:45 -08:00
Jonathan Williams
f98d6e0534 Fixed personal servers overriding existing servergroups. 2015-02-09 00:15:18 -08:00
Mini-Chiss
26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
Shaun Bennett
c285fae035 Merge remote-tracking branch 'origin/master' 2015-02-06 23:40:14 -05:00
Shaun Bennett
b85494a037 Show player skins in friend gui 2015-02-06 23:40:06 -05:00
Shaun Bennett
ed8638ae9f Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it 2015-02-06 23:39:22 -05:00
libraryaddict
219ac93dc4 Don't allow the server to increment the mapcount information. 2015-02-07 16:06:53 +13:00
libraryaddict
c61f97d0eb Why didn't this get included in that previous commit.. 2015-02-07 03:54:19 +13:00
libraryaddict
8851cccff4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-07 03:53:17 +13:00
libraryaddict
68d1ba4507 Add API to create walls of maps to create a giant image. Please use responsibly. 2015-02-07 03:52:19 +13:00
Shaun Bennett
de1d2d4688 Just ignore this commit. Nothing fancy here! 2015-02-06 00:42:17 -05:00
Shaun Bennett
36b43af2c2 Fix inconsistency in friends gui 2015-02-06 00:14:46 -05:00
Shaun Bennett
48db23c862 Fix for enderchests closing after being opened, go shaun! 2015-02-06 00:10:17 -05:00
Shaun Bennett
922f2d5ee9 Merge remote-tracking branch 'origin/master' 2015-02-05 23:20:45 -05:00
Shaun Bennett
fcb3d20778 Move tablist stuff to portal, show current server on tablist 2015-02-05 23:20:39 -05:00
Shaun Bennett
2f64b5f401 1.8 tablist fix - spigot needs to be updated! 2015-02-05 23:09:20 -05:00
Chiss
417122b7a7 reduced rate that smash crystal spawns 2015-02-06 14:47:34 +11:00
Chiss
09b78fccd7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-06 14:16:26 +11:00
Chiss
14fc6f2145 Chest Update 2015-02-06 14:16:10 +11:00
Shaun Bennett
f8885e4c5c Merge remote-tracking branch 'origin/master' 2015-02-05 21:36:19 -05:00
Shaun Bennett
d878e3940e War state, handle time better, ability to have a server timezone (see ClanManager) 2015-02-05 21:36:07 -05:00
libraryaddict
25548046d8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-05 23:42:41 +13:00
libraryaddict
f549402712 Modify wizards to use | for bossbar displays 2015-02-05 23:42:26 +13:00
Chiss
79cde8f5cf fixed util textbottom for 1.8.2 2015-02-05 21:39:42 +11:00
libraryaddict
64b79424d7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-05 22:34:34 +13:00
libraryaddict
6f8d39b630 Fixed spiders climbing liquids 2015-02-05 22:34:06 +13:00
Jonathan Williams
44bab01e33 Added NoCheatPlus hook for double jump fly hack prevention. 2015-02-04 21:52:14 -08:00
Jonathan Williams
fabf385a57 Added exception handling for group change exceptions so entire dynamic monitor doesn't stop. 2015-02-04 21:41:33 -08:00