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

1453 Commits

Author SHA1 Message Date
Cheese 8d2b1650af world component for MCPE 2015-07-05 15:13:18 +10:00
libraryaddict e002e4af18 Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises 2015-07-05 13:37:07 +12:00
Cheese 556e524e18 changed notifications back to 75% sale 2015-07-02 16:14:47 +10:00
Jonathan Williams 2069524f15 Merge remote-tracking branch 'remotes/origin/foo' 2015-06-29 18:14:07 -04:00
Jonathan Williams bbb661d686 Fixed up BenefitManager. 2015-06-29 18:07:06 -04:00
fooify 4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Jonathan Williams d426c24970 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 06:14:30 -04:00
Cheese da3c5eeaaf 40k b enefit 2015-06-29 20:14:15 +10:00
Jonathan Williams 9f384b0d3e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-29 06:02:57 -04:00
Cheese 48f5fa118a fixed a few sky bugs 2015-06-29 14:26:00 +10:00
Cheese 0ea388379a reduced win req for skywars ach 
enabled beenfit for 40k reward
 2015-06-28 15:16:05 +10:00
Jonathan Williams 65a10461cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java
 2015-06-27 02:29:07 -05:00
Jonathan Williams 9a4bcd29a1 Fixed Sparks problems... 2015-06-27 02:26:29 -05:00
fooify 333c54cff9 Merge branch 'master' into foo 2015-06-26 10:07:13 -07:00
Shaun Bennett 8ef52ea103 Mineplex Gold Rush 2.0 2015-06-26 10:50:37 -05:00
Cheese c0bc522614 split achievement text over 2 lines 2015-06-26 19:32:18 +10:00
Cheese 1aa0832bb9 SkyWars to Skywars 2015-06-26 17:55:49 +10:00
Jonathan Williams f906f08a18 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:34:36 -05:00
Shaun Bennett 7c698f65cf Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads 2015-06-26 02:31:35 -05:00
Jonathan Williams c78ef9d93d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:30:01 -05:00
Cheese 2498f7756c skyawrs stats icon 2015-06-26 17:16:16 +10:00
Cheese 027efe02fc skywars! 2015-06-26 16:38:44 +10:00
Jonathan Williams efa06d370b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 01:13:42 -05:00
Jonathan Williams 86e2514e37 Fixed callbacks for gem/coin rewards. 2015-06-26 01:13:28 -05:00
Cheese caa51d0e89 Merge branch 'SkyWars' 2015-06-26 16:04:46 +10:00
Cheese 338797f4a6 skywars update 2015-06-26 15:57:47 +10:00
Cheese aef8a00017 update! 2015-06-26 15:25:43 +10:00
Cheese 2d1d65b239 skywars fixes 2015-06-26 13:15:03 +10:00
Jeremiah Bishop 0342a5ac61 Fixed Achievements 
Reordered Kits
Added new Kit
etc, etc, etc...
 2015-06-25 19:03:25 -04:00
fooify 2679d19a81 Missed a spot. 2015-06-25 08:19:12 -07:00
fooify ba9e4ba5d9 Fix staff server not hiding in friends list 2015-06-25 08:17:28 -07:00
Cheese 2179795677 Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
 2015-06-25 20:48:34 +10:00
Cheese 2bf1faa70d fixed a few skywars bugs 
added ore generation (but theres some wierd bug, still working on it)
 2015-06-25 20:24:31 +10:00
Jeremiah Bishop ed667fedee Added more achievements 2015-06-24 22:59:28 -04:00
Cheese b77279a160 fixed notif msg 2015-06-25 11:22:23 +10:00
Jeremiah Bishop cd10a2ad79 Fixed both kits 
Added game achievements.
 2015-06-24 20:08:31 -04:00
fooify ea3c04b8c1 Add fooify to list of AFKers 2015-06-24 10:24:08 -07:00
Jeremiah Bishop 7583e4170b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-22 21:40:43 -04:00
Cheese 3a06b54b7f Changed notifications to 50% off sale 2015-06-22 17:10:03 +10:00
Jeremiah Bishop a05c2d085d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-21 16:17:51 -04:00
Aaron Brock 3532dea892 Allowed Helper+ to bypass anti-hackusating 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 10:01:50 -04:00
Jonathan Williams 90e13b4b9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-20 03:37:33 -05:00
Jonathan Williams dbde6890a0 Add fallback to load by name if no uuid. 2015-06-20 03:36:55 -05:00
Aaron Brock 9cedb3b742 Rewrote how hackusations are detected. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:10:26 -04:00
Cheese 478a3c8591 some champs fixes/balance 
duplicate message improvement
 2015-06-20 15:00:16 +10:00
Cheese 77bf332c29 level 25 is uneffected by chat delay 2015-06-20 11:18:31 +10:00
Cheese 2c43dc76c9 DMT no longer effected by 3s chat delay 
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
 2015-06-20 11:12:24 +10:00
Cheese cf152c4897 fixed notifs being sent to people who didnt need them 2015-06-19 13:46:56 +10:00
Cheese de83e58e75 removed debug 2015-06-19 13:29:32 +10:00
Cheese 8a224950b3 Added sale notifications 
Added 3s chat delay
 2015-06-19 13:27:59 +10:00
Jeremiah Bishop dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
libraryaddict b0c026e67c Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn 2015-06-16 14:01:52 +12:00
Jonathan Williams 47099a0b20 Changed default redis ip to new us redis. 
Changed previous server to gold text when sending to new server.
 2015-06-12 15:45:54 -05:00
Jonathan Williams c6352445cf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-08 23:18:06 -05:00
libraryaddict 8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +12:00
libraryaddict 6c9963e1b3 CommandCenter: Cancel command event straight after verifying that its been registered 2015-05-30 05:44:49 +12:00
Shaun Bennett 7d43b146b7 [Core] Display Games Played instead of Losses for a bunch of the arcade games where losses will be greater than wins 2015-05-28 19:05:45 -05:00
Jonathan Williams 2c5471cb34 Added ability to see which server you were sent from. 2015-05-28 09:33:49 -05:00
libraryaddict d84bd4ffe4 Messaging: Now with censors! 2015-05-28 10:13:31 +12:00
Jonathan Williams 96b1df4ee0 Fixed global player count. 
Fixed tasks.
 2015-05-22 14:33:25 -07:00
Jonathan Williams f0c7f2fe76 Merge branch 'MSSQL_Conversion' 
Conflicts:
	Website/LOCWebsite.suo
 2015-05-17 23:11:50 -07:00
Shaun Bennett 0d2157b4f3 [Core] Fix /stats lava bucket bug 2015-05-13 23:23:43 -05:00
Jonathan Williams a6cf1309ff Fix for ranks not applying. 2015-05-13 14:33:31 -07:00
Jonathan Williams 1c6a12528c Added ability for LT to modify Admin ranks. 
Added Twithc rank to the updateRank list.

Fixed server sorting issues with UHC Generating servers.
 2015-05-13 00:58:45 -07:00
Shaun Bennett aa5898e1db Merge remote-tracking branch 'origin/master' 2015-05-12 18:43:48 -05:00
Shaun Bennett f9269b534f [Core] Add look AI to NPC's 2015-05-12 18:43:26 -05:00
Shaun Bennett d703070810 [Core] Shrink stat page 2015-05-12 17:20:58 -05:00
Shaun Bennett 53555a42cd [Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats 2015-05-12 17:14:50 -05:00
Mini-Chiss e1dd3a318e UHC!!!!! 2015-05-12 15:52:19 -05:00
Shaun Bennett 90fc4656fa [Core] Attempt at mitigating spam bots without hurting normal players 2015-05-12 08:09:13 -05:00
Shaun Bennett 5d13b6a144 [Core] Disable writing on signs for muted players 2015-05-12 07:11:35 -05:00
Shaun Bennett 87f495e376 [Core] Filter text on placed signs with Chat Module 2015-05-12 07:02:34 -05:00
Shaun Bennett 06a0f3d0d5 Merge remote-tracking branch 'origin/master' 2015-05-12 00:37:40 -05:00
Shaun Bennett 9d959ee7a3 Fix/Enable Look at me Button 2015-05-11 20:46:37 -05:00
Mini-Chiss 643ed2c047 Fixed most enchants not working 
added commands to event
minor update to snowfight to make it more fun
 2015-05-11 19:55:26 -05:00
Mini-Chiss 8d585ce807 admins can giveitem 2015-05-11 17:59:13 -05:00
Mini-Chiss 55b6d29468 Just shufflin some location 2015-05-11 17:57:21 -05:00
Mini-Chiss 123af16bd2 UHC map gen 2015-05-11 13:25:05 -05:00
Jonathan Williams b1a46d0f0d Converted TaskManager 2015-05-11 01:21:27 -07:00
Mini-Chiss 6e2b437e55 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-09 12:28:16 -05:00
Mini-Chiss 822718095d cannot PM from spawn 
first push of cards game
 2015-05-09 12:23:07 -05:00
libraryaddict 29c4a033a7 Achievement: Fix wizards 10 win to 50 wins, change wizards to blaze rod, change stats layout 2015-05-08 18:56:00 +12:00
libraryaddict 5ec04263d4 Map stuff: First commit (or second?) 2015-05-08 07:31:03 +12:00
Jonathan Williams e999f943b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-06 20:20:07 -07:00
Jonathan Williams d3e5dd9c8a Fixed so name searching only returns the last account logged in with that name. 2015-05-06 20:19:58 -07:00
libraryaddict 3e02806b75 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-07 02:57:20 +12:00
libraryaddict 531fe11916 Maps: Rename Map.class to BlockMap.class 2015-05-07 02:57:12 +12:00
Mini-Chiss 40d56c3500 Converted all code to updated UtilParticle methods 
/suicide
 2015-05-03 16:37:00 -05:00
Mini-Chiss ab6937a525 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 18:05:55 -05:00
libraryaddict f85d27db1a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 19:25:11 +12:00
libraryaddict cc65830f9b ResourcePack: Ignore ServerGroup's resource pack and set MineStrike to use new ResourcePack code 2015-05-01 19:24:20 +12:00
Mini-Chiss 1b8ab13160 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 00:51:52 -05:00
Mini-Chiss ba5802cc14 wizards kit availability 2015-05-01 00:47:51 -05:00
Jonathan Williams fa4466b6a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-05-01 00:13:39 -05:00
Jonathan Williams d161d62773 Added chat filtering to private messages. 2015-04-30 23:56:08 -05: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
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 33bbe96964 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards 2015-04-30 01:33:43 +12:00
libraryaddict c2b7001fcc Wizards: Current progress 2015-04-30 01:32:22 +12:00
Jonathan Williams ae1480fb1e Little bit of spacing fixed. 2015-04-21 23:36:33 -05: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
Cheese f4a91455f6 Champions Balance 2015-04-19 12:22:51 +10: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
Jonathan Williams 99436b4a42 Added Tab event back :D 2015-04-14 02:01:04 -05:00
Jonathan Williams c454973398 Changed login deets for new new db cluster. 2015-04-14 01:59:29 -05: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
libraryaddict c36c800bb5 AchievementManager: Add SnrMod as a min MP level of 15 2015-04-13 14:05:50 +12: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
Jonathan Williams 49431da509 Fix for pulling account UUID with multiple. 2015-04-10 10:53:11 -05:00
Cheese 18ba446764 re-enabled MAC 2015-04-07 08:30:32 +10: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
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 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
libraryaddict 66c83397e5 DisguiseManager: Add DisguiseRabbit 2015-04-03 20:52:09 +13:00
Jonathan Williams 120420d35f Really fixed disguise memory leak this time. 2015-04-02 23:37:43 -07:00
Jonathan Williams fb4be35dfe Let admins apply youtube rank. 
Limit Lobby count to 250.
 2015-04-02 23:36:54 -07:00
Jonathan Williams 437c70e548 Fixed issue with double run() call in loadClientByName. 2015-04-02 23:36:16 -07: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
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 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
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 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 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 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 589d4b1aae CoreClientManager accessible to public in MiniDbClientPlugin now. 2015-03-25 15:03:08 -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
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
Jonathan Williams 4b81f6cd8b Fixed Memory leak with lastState in VisibilityData 2015-03-20 09:05:25 -07:00
Cheese f54ed0ece2 visibility fix 2015-03-20 23:20:56 +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 52f0941fb9 Add resourcepack options 2015-03-17 23:59:24 +13:00
libraryaddict ec30269a14 Add new loot classes to manage loot 2015-03-17 18:08:47 +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 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 44e887ec61 fixed give command to properly assign item data 2015-03-17 12:06:41 +11:00
Jonathan Williams 2dade32499 Added support for creating Event servers. 2015-03-15 20:50:54 -07: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 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 db7def2980 Add relative teleports to /teleport command 2015-03-15 12:42:29 +13:00
libraryaddict 20a51ee7fc Change Blood to unstackable items 2015-03-15 12:30:42 +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 d38a28981b Fixed NPE when type /friend with a space after it. 2015-03-14 06:20:33 -07: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 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 28f73704e5 Improved party lookup for server transfers. 
Always transfer party if leader transfers servers.
 2015-03-13 00:10:29 -07:00
Cheese c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11: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
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
Cheese 3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11: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
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
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
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 27c17eccfb Disabled redis pub commands. 
Added getServerStatusesByPrefix to redis.
Increased timeout for servers.

Turned on DoubleGemWeekend
 2015-03-08 13:47:49 -07: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 14da350b16 Removed unnecessary Windows DB call for Pet Factory. 2015-03-07 21:47:48 -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
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