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

1076 Commits

Author SHA1 Message Date
Jonathan Williams
0101531291 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2014-05-02 23:15:08 -07:00
Jonathan Williams
484ba97b23 Updated file delete mechanism so there is no reflection. 
Removed list block on deleting players from coreclient quit.
 2014-05-02 23:12:39 -07:00
Chiss
4304327bf9 Disallowed /spec during games. 2014-05-03 13:06:15 +10:00
Chiss
395a5d2c08 MAC disabled with Tournament Mode 
Bridges TM game desc fix
 2014-05-03 11:47:15 +10:00
Chiss
e818662161 Added /spec toggle, to allow players to not partake in games. 
Added TeamArmorAddon for games to use, to mark team colors easier.
Minor other changes.
 2014-05-03 11:23:10 +10:00
Chiss
1d4d98b910 Twitch Prep 
MAC changes
 2014-05-02 14:35:41 +10:00
Chiss
c1360c63f0 More strikes for auto-kick 
Updated MAC kick message
 2014-05-01 09:38:37 +10:00
Chiss
a17c1aca44 Allow more for lag in MAC 2014-05-01 09:36:30 +10:00
Chiss
8240101d60 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
 2014-05-01 09:33:59 +10:00
Chiss
423a355057 Helpers+ wont be kicked yb MAC 2014-05-01 09:31:47 +10:00
Jonathan Williams
f4a92ec07a Implemented Logger 
Logger now catches all uncaught exceptions and logs them to DB.

Put in some preventative checks in Hub/Party as they threw a lot of the same errors.

Added autoreconnect to AntiHack as it was spamming errors in DB
 2014-04-30 10:57:19 -07:00
Jonathan Williams
7637d94ae0 Added mysql logger. 
Hooked it up in a few places.

Fixed Asynch crap with AntiHack.
 2014-04-30 00:31:22 -07:00
Jonathan Williams
42e9fe879c Fix for party filtered party messages going to everyone. 2014-04-29 13:45:38 -07:00
Jonathan Williams
e958a922fe Fixed Hub chat so it goes through filter. 
Added back in server name so it tracks correctly.

Fixed PlayerCount in Mineplexer AGAIN.
 2014-04-29 12:53:22 -07:00
Jonathan Williams
cee2883786 Added some verbage around command center block. 
Fixed async chat connection stuff.
 2014-04-29 12:13:32 -07:00
Jonathan Williams
3ec1653532 Added in chat filtering command and finished up filtration. 2014-04-29 11:54:20 -07:00
Jonathan Williams
1bcdc71c14 Added ping logging to Antihack reports. 2014-04-28 01:53:02 -07:00
Jonathan Williams
fd372b8418 Changed skills to 2k gems each. 
Changed power/booster to 2k gems each.

Added AntiHack perm storage of kicks.
Commented out SafeChat stuff for now.
 2014-04-28 01:05:08 -07:00
Jonathan Williams
66aa7223cc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-27 21:59:35 -07:00
Jonathan Williams
47417dea6b Implemented initial SafeChat. 2014-04-27 21:59:18 -07:00
Chiss
dc6a3da0fa Added more DMT words 2014-04-28 14:08:40 +10:00
Chiss
77809b409d MAC Update 2014-04-28 12:28:48 +10:00
Chiss
c5509f870f Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-28 09:43:18 +10:00
Chiss
40ef432211 Cannot use skills/items in HubManager 
Dom CP score rate lowered
Dom items dont use energy
 2014-04-28 09:41:00 +10:00
Jonathan Williams
62740b6f5b Tweaked ServerMonitor to keep track of servers started/restarted and to handle us/eu in same build. 2014-04-26 23:26:56 -07:00
Jonathan Williams
0e72d1c1eb Added extra sleep to monitor because servers take longer to startup with spigot. 2014-04-26 09:21:51 -07:00
Jonathan Williams
7b264b0867 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-26 09:21:11 -07:00
Chiss
82afefd11a Quick fix for respawning players not being able to get stuff from creative inventory 2014-04-27 01:09:25 +10:00
Jonathan Williams
2b4c0135bf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-26 02:47:19 -07:00
Jonathan Williams
7c9017f184 Fixed Bungee issue with ServerPing in MOTD. 
UPdated to latest spigot again.

Removed useless 1.7 stat tracking.

Fixed Party issue in hub
 2014-04-26 02:47:04 -07:00
Chiss
95d6ec7f50 Barrage fix 2014-04-26 17:25:35 +10:00
Chiss
07ca3a83ca Arrows shouldnt bounce 2014-04-26 13:37:01 +10:00
Chiss
b86b014058 Fixed a whole bunch of bugs 2014-04-26 11:59:11 +10:00
Jonathan Williams
9a3b73a137 Add new file, removed insentient a(groupdata call 2014-04-25 17:53:31 -07:00
Jonathan Williams
ac1c081bc8 Fixed scoreboard issues. 2014-04-25 17:52:04 -07:00
Jonathan Williams
a37ace7576 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-25 00:44:27 -07:00
Jonathan Williams
9136fa0b15 Upgraded to latest spigot. 
Fixed npcs being so loud.
Npcs are now ghosted automatically.

Added UUID on login.
 2014-04-25 00:44:14 -07:00
Chiss
8229925fca HUB NEWS 2014-04-25 17:37:42 +10:00
Chiss
9495630bf2 CP rate increase 2014-04-25 11:10:37 +10:00
Jonathan Williams
7fef4adbee Fixed resupply resetting skills. 2014-04-22 22:19:03 -07:00
Jonathan Williams
97c8573926 Added logging to proxy Plugin. 
Changed tracking to async logging so it doesn't stop players from connecting if stats is down or slow.
 2014-04-22 22:10:25 -07:00
Chiss
7ea601e94b Cant open bridge chests until bridges are down. 2014-04-23 10:38:59 +10:00
Chiss
0325892e2a Champs water fixes 
First push for Twitch games
 2014-04-23 10:21:01 +10:00
Jonathan Williams
e62dfb0dd2 Fix skill/item packs not deducting gems. 
Fix players not getting spectating flag when dying.
 2014-04-22 16:50:44 -07:00
Jonathan Williams
7680eaaedc Fixed non-Ultra being able to unlock spells/skills. 
Fixed Items that weren't free.
 2014-04-22 11:20:00 -07:00
Jonathan Williams
2378df6191 Fixed builds losing tokens. 2014-04-22 10:35:56 -07:00
Chiss
923d2455d0 Stampede ends immediately on taking damage 2014-04-21 17:21:52 +10:00
Chiss
bddc36271d fixed gems for capture 2014-04-21 17:16:35 +10:00
Chiss
6ee516ba4a Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-21 17:14:34 +10:00
Chiss
0f31052d00 cannot shoot arrow in water. 
less gems for capping
 2014-04-21 17:14:23 +10:00
Jonathan Williams
2e0e033ba3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-21 00:12:17 -07:00
Jonathan Williams
75b44953bf Fixed arrow bounce. 2014-04-21 00:12:00 -07:00
Chiss
62c245d728 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-21 17:06:08 +10:00
Chiss
0f0b66a8cf Stampede cancel on damage taken 2014-04-21 17:04:51 +10:00
Chiss
a150249f4f game will not announce winner multiple times 2014-04-21 17:01:50 +10:00
Jonathan Williams
9ce6d4866d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-20 23:37:01 -07:00
Jonathan Williams
e012129427 Fixed edit custom build bugs. 
Fixed vehicle exit event not firing.
Fixed item info not showing once you have the item.
 2014-04-20 23:36:45 -07:00
Chiss
adf8821a26 more CP changes 2014-04-21 12:55:24 +10:00
Chiss
b1e082b73a fixed riposte bug 
tweaked capture effects
 2014-04-21 11:56:14 +10:00
Chiss
0eaa3110f5 Risposte nerf 2014-04-21 11:18:14 +10:00
Chiss
b8e573e8f8 redid capture display. much less annoying. 2014-04-21 11:15:49 +10:00
Chiss
07098b0b82 fixed no damage on weapons 
items not usable until game is live
fixed proxies not triggering
some skill balance/fixes
players with null kit are now given default knight
 2014-04-21 10:48:04 +10:00
Chiss
ddc8e435e8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
 2014-04-21 08:49:13 +10:00
Chiss
3281eb2ed7 Merge 2014-04-21 08:47:07 +10:00
Jonathan Williams
60039d5b76 More missing files. 2014-04-20 01:07:59 -07:00
Jonathan Williams
8bf40169f3 Added missing files. 2014-04-20 01:06:55 -07:00
Jonathan Williams
65e94e59cc Changed item tokens to 10 for non bow classes. 
Fixed token prices on power/booster items.
Removed You already have this item message on items in CustomBuild.
 2014-04-20 01:06:17 -07:00
Jonathan Williams
1f225f05ff Custom build fixes. 2014-04-20 00:27:32 -07:00
Jonathan Williams
dc625726c4 Item Custom Build Fixes. 2014-04-19 22:54:52 -07:00
Jonathan Williams
458f5741d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-19 20:54:04 -07:00
Jonathan Williams
e5e9cc7284 Custom Items in custom Builds for dom. 2014-04-19 20:53:55 -07:00
Chiss
845d45bd4d fixed some skill bugs 
players quitting during recruit will no longer remain on a team, caused unbalance
GiveClock flag added to game, to stop giving clock.
 2014-04-20 13:50:15 +10:00
Chiss
de2b42e190 fixed tnt bug 2014-04-19 15:18:13 +10:00
Chiss
b720a6433c Explosions crack carved stone brick 2014-04-19 15:10:30 +10:00
Chiss
1bf1f04d53 Champs Stuff 2014-04-19 14:50:14 +10:00
Chiss
424f915388 Champs Merge 2014-04-18 13:24:30 +10:00
Jonathan Williams
6b07541b3b DERP JONLONS 2014-04-15 18:40:43 -07:00
Chiss
5ac48a02fb Stripped indicator func out of Condition 
Class Combat skills arent usable before game starts
Silence re-enabled for class combat skills
 2014-04-15 17:53:24 +10:00
Jonathan Williams
81ab27cd83 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-14 17:09:47 -07:00
Jonathan Williams
6c8651d2c7 Fixed classes not being added. 2014-04-14 17:09:37 -07:00
Chiss
1c23cf7b4e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-14 09:27:44 +10:00
Chiss
e5ea7483db Merge 2014-04-14 09:27:31 +10:00
Jonathan Williams
d3a3cc278f Fixed ultra custom builds not saving. 
Fixed default builds.
Fixed armor bug.
 2014-04-13 04:24:22 -07:00
Jonathan Williams
591caa1589 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-13 01:36:46 -07:00
Jonathan Williams
cac59afed4 Fixed bug with missing default skill and kit page opening. 2014-04-13 01:36:34 -07:00
Chiss
5df8d34426 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
 2014-04-13 18:01:55 +10:00
Chiss
9874dae60f Merge 2014-04-13 18:00:53 +10:00
Jonathan Williams
5efaf9bd36 Fixed inf loop. 2014-04-13 00:59:55 -07:00
Chiss
b22be81cbb Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-13 17:49:44 +10:00
Jonathan Williams
8b159557b2 Added PvpClass set in default customBuild. 2014-04-13 00:49:16 -07:00
Chiss
d087b379d1 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-13 17:21:02 +10:00
Chiss
85aa748218 Champs Bug Fixes 2014-04-13 17:20:49 +10:00
Jonathan Williams
d84c234f47 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-13 00:16:07 -07:00
Jonathan Williams
1b25dce2c5 Added default application on setGameClass. 
Removed print info on custom build saving.
 2014-04-13 00:15:44 -07:00
Chiss
081da93bbd blocked /bukkit:me 2014-04-13 11:19:16 +10:00
Chiss
f25a6c26c9 Champs Update 2014-04-13 11:06:10 +10:00
Chiss
154479d1b7 Fixed TDM health 2014-04-13 09:29:22 +10:00
Chiss
f73d4d3e23 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-13 09:29:12 +10:00
Chiss
2e4bc587b1 Champs Update 2014-04-13 09:26:31 +10:00
Jonathan Williams
1cb35262ac Fixed skill tokens not being returned. 2014-04-12 14:02:40 -07:00
Jonathan Williams
98430be09e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-12 01:45:01 -07:00
Jonathan Williams
8f42d91d8a Fixed ban kick bug. 
Fixed Hub right click mount crash bug.
Fix for custom builds not saving.
Fixed Bridges not starting/hanging.

Updated to 1.7.8 spigot support.

Removed logging on HS.
 2014-04-12 01:28:33 -07:00
Chiss
ecc40bda47 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-12 18:25:59 +10:00
Chiss
ba1c6ae35f Champs Balance 2014-04-12 18:22:53 +10:00
Jonathan Williams
eb1d1c1ed2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-11 03:10:02 -07:00
Jonathan Williams
c8af89dded Fixed BH and GRavity. 2014-04-11 03:09:21 -07:00
Chiss
80df2c2944 Bux fixes for 1.7 
Champions TDM
SSM Domination
 2014-04-11 15:33:31 +10:00
Chiss
71b2931936 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-11 10:34:51 +10:00
Chiss
2adf0395a1 Merge 2014-04-11 10:33:56 +10:00
Jonathan Williams
0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Jonathan Williams
a26894fda6 Added missing file. 2014-04-09 21:38:12 -07:00
Jonathan Williams
84ffd56c82 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-09 02:50:46 -07:00
Jonathan Williams
8460fcc8f6 Added ninja check for bow charge if you just right click quickly. 2014-04-09 02:50:37 -07:00
Chiss
b64acf524c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-09 19:07:22 +10:00
Chiss
b868db0f22 Fixed so you can now charge bow skills in air. 2014-04-09 19:07:12 +10:00
Jonathan Williams
e4ca9084cc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-09 02:03:41 -07:00
Jonathan Williams
ec29c66d1c Added arrows sticking in you. 
Removed bouncing arrows.
 2014-04-09 02:03:19 -07:00
Chiss
146202a52c Champs Balance + Red Arrow Fix 2014-04-09 18:50:38 +10:00
Chiss
7d59f43ffa Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-09 16:48:14 +10:00
Chiss
0ecd38c656 Champs Balance 2014-04-09 16:48:01 +10:00
Jonathan Williams
bedabd84cc Added silence to kits (UtilEnt.silence) 
Cleaned up a ton of unused code....
 2014-04-08 23:31:32 -07:00
Jonathan Williams
e8260b20f7 Fixed dragon spawn location for text util. 2014-04-07 23:35:45 -04:00
Jonathan Williams
9b4e1aa9eb Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-07 22:25:08 -04:00
Jonathan Williams
109d2cb6f1 Fixed edit build issue. 2014-04-07 22:18:04 -04:00
Chiss
2eaaa85e04 Fixed /game stop trapping players in dead world. 2014-04-08 12:08:59 +10:00
Chiss
bb3f2c6281 CHAMPS 2014-04-08 10:53:41 +10:00
Chiss
85c57f2942 IButton now has Left/Right 
Added right-click skill removal.
 2014-04-06 12:45:52 +10:00
Jonathan Williams
88131836d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-05 16:01:07 -04:00
Jonathan Williams
db2ae49074 Fixed saving custom builds. 
Work on skill tokens.
 2014-04-05 15:53:22 -04:00
Chiss
8214e3b8f4 Lots of little bug fixes 2014-04-05 16:52:23 +11:00
Jonathan Williams
05d916de3c Fixed custombuild selection not applying armor 2014-04-04 15:57:56 -04:00
Jonathan Williams
ddcc8a26b3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-04 15:02:42 -04:00
Jonathan Williams
edfe23fb01 Fixed collision with Projectiles. 2014-04-04 15:02:13 -04:00
Chiss
13b8f1e7ea Champs Update 2014-04-04 13:26:00 +11:00
Chiss
26fe974b00 More CHamps 2014-04-03 15:48:58 +11:00
Chiss
80c153095b Cooldown bar 2014-04-02 22:03:56 +11:00
Chiss
2f0167ea09 Champs Update 2014-04-02 21:22:21 +11:00
Chiss
2aaf749414 Champions Update 2014-04-02 15:19:58 +11:00
Jonathan Williams
afc26e21e3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-29 18:46:52 -04:00
Jonathan Williams
06bdc22c89 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-29 18:45:53 -04:00
Chiss
0f937b165c skill shop stuff 2014-03-30 09:45:53 +11:00
Jonathan Williams
d227a6bd06 Changed full server message 2014-03-29 18:45:44 -04:00
Chiss
e1eda749a7 Skill lore changes 2014-03-30 09:05:29 +11:00
Jonathan Williams
b7857ef20c Fixes for Skill level desc. 
Fix for level staying same across skill changes.
Removed logging statements in ClientClass
 2014-03-29 02:49:57 -04:00
Chiss
f4e8879d55 skilly test stuff 2014-03-29 17:07:07 +11:00
Jonathan Williams
195e555a6e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-29 01:33:18 -04:00
Jonathan Williams
6963f6bacf Added Player version stat tracking. 
Added server group stats.
 2014-03-29 01:32:24 -04:00
Chiss
fce249d7d8 fixed some desc stuff 
castle seige removed OP kit
 2014-03-28 18:50:38 +11:00
Chiss
4386ce0b96 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
 2014-03-28 14:55:13 +11:00
Chiss
f5ca6408f8 Merge? 2014-03-28 14:51:26 +11:00
Jonathan Williams
aae40d3899 Changed up Skills and SkillsPage for Dom 2 changeover. 
Fixed CustomBuild stuff.
 2014-03-27 22:17:31 -04:00
Chiss
47feabcad3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-28 10:06:03 +11:00
Jonathan Williams
17e6658437 Fixed up AntiHack database reporting. 2014-03-24 01:16:02 -07:00
Chiss
2680edbd85 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-24 16:15:29 +11:00
Jonathan Williams
2450265909 Fixed damage rate limiting for mobs. 2014-03-22 00:16:51 -07:00
Chiss
e4a86e0600 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-22 10:45:01 +11:00
Chiss
fe09c3fc49 More CS Update 2014-03-22 10:44:31 +11:00
Jonathan Williams
8bf78fe14d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-21 15:30:06 -07:00
Jonathan Williams
33d342b049 updated 1.7 stuff. 2014-03-21 10:57:31 -07:00
Chiss
ab2a72ba16 CS Update 2014-03-21 11:59:56 +11:00
Jonathan Williams
f24f81b7c3 Finished conversion. 2014-03-19 04:09:40 -07:00
Jonathan Williams
515a01fd7d Updated utils. 2014-03-19 02:40:36 -07:00
Jonathan Williams
7f58453688 Updated Particle. 2014-03-19 02:25:28 -07:00
Jonathan Williams
7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -07:00
Jonathan Williams
98baef09bf Added 1.7 files. 
Removed 1.6 files.
 2014-03-19 00:58:43 -07:00
Chiss
a7888b0c02 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-19 17:51:48 +11:00
Chiss
7714ff4a09 CS Update 2014-03-19 17:51:37 +11:00
Jonathan Williams
24f1c6c722 Fixed saving custom builds. 
Fixed items staying from previous class in game.
 2014-03-18 23:40:54 -07:00
Jonathan Williams
9715f5454a Removed double gems. 
Removed unused code for ssm time
 2014-03-18 12:55:04 -07:00
Chiss
6830033d8a PLEASE JUST WORK :( 2014-03-16 10:52:34 +11:00
Chiss
d6e3f076cd PLEASE JUST WORK MR TORTOISE 2014-03-16 10:42:30 +11:00
Chiss
3277a0a2f8 Making sure puushed 2014-03-16 10:35:58 +11:00
Chiss
d695ec72ca Added SSM Team Game 2014-03-16 10:28:46 +11:00
Jonathan Williams
3603d3ef8b Removed afk kick from arcade. 2014-03-14 21:49:01 -07:00
Jonathan Williams
0094c0ebeb Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-14 02:20:01 -07:00
Jonathan Williams
246f28a464 Enabled DoubleGem weekend. 
Added 3 new maps
updated news
 2014-03-14 02:19:52 -07:00
Chiss
aa206d9c91 Gravity fixes 2014-03-14 20:17:06 +11:00
Chiss
24efe3d0d8 SQ kit restrictions 2014-03-14 13:24:38 +11:00
Jonathan Williams
de1365b5cf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-13 17:56:16 -07:00
Jonathan Williams
efee9fdcbf Fixed Hub class shop. 
Added chat logging.
Added message with file updater.
 2014-03-13 17:56:05 -07:00
Chiss
f4cd2fcbb9 Staggered game teleports/start 2014-03-13 18:18:22 +11:00
Chiss
27f554ab61 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-13 16:33:03 +11:00
Chiss
82644002c5 A little bit o dem ol bug fixles. yknow what im sayin? 2014-03-13 16:32:48 +11:00
Jonathan Williams
b6ee99596a Work on Dom shop page. 
Removed unused shops

Removed unnecessary include of Core project files in build xml
 2014-03-12 01:06:56 -07:00
Jonathan Williams
c4b7cd19c8 Added default builds for kits in Champions/Dominate 
Added default build selection in lobby when only hitting kit and not selecting a build.
 2014-03-11 03:29:11 -07:00
Jonathan Williams
f277b1da23 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-09 19:43:14 -07:00
Jonathan Williams
02a1e68c8c Fixed kits opening correct page. 2014-03-09 19:42:54 -07:00
Chiss
105b210afa mob spawnin' 2014-03-10 13:42:05 +11:00
Chiss
464fdb1e5e Renamed Champions to Dominate 2014-03-10 13:35:36 +11:00
Chiss
8593eb326e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-10 13:32:52 +11:00
Chiss
1bc5fef625 Kit npc location change 2014-03-10 13:32:39 +11:00
Jonathan Williams
a565da45e4 Added classes to champions. 
Added ability to open direct classes page.
 2014-03-09 19:32:27 -07:00
Jonathan Williams
f51a6747fd Moved files into Mineplex.core 
Removed references to Core project.
 2014-03-09 00:50:13 -08:00
Jonathan Williams
2cc50d5725 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-06 02:15:46 -08:00
Jonathan Williams
d05c2f906c Fix for ServerNpc page beta join. 
Work on Dom 2.0

Added sheep quest map.
 2014-03-06 02:15:16 -08:00
Chisstop
60bc3f15bb Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-05 14:35:01 -08:00
Chisstop
c9a938d2c5 Sheep Quest Fixes 2014-03-05 14:34:51 -08:00
Jonathan Williams
a09a2aaa30 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-05 00:40:51 -08:00
Jonathan Williams
f0b347f97f Changed beta testing to Ultra and up. 
Did some work on DOM 2.0
 2014-03-05 00:34:20 -08:00
Chisstop
af2cf4e7a9 this is the one change i needed to push 2014-03-04 23:27:37 -08:00
Chisstop
2b56b970fa Sheep Game? 2014-03-04 22:39:48 -08:00
Jonathan Williams
d99a3c9253 Optimized mysql queries with server status' address/updated fields. 
Removed double gems.
Added BETA check for Hero only beta games.
 2014-03-03 12:47:57 -08:00
Jonathan Williams
b3f10b9d62 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-01 01:59:25 -08:00
Jonathan Williams
750fff32c7 Added Skeletal horse. 2014-03-01 01:58:58 -08:00
Chiss
b54e4dfbc4 hunger 2014-03-01 11:29:01 +11:00
Chiss
18880a00f4 fletcher doesnt give to specs 2014-03-01 11:09:15 +11:00
Chiss
dfa4ea0edc fix 2014-03-01 11:06:01 +11:00
Chiss
8d0115f874 News update 2014-03-01 10:40:55 +11:00
Chiss
bfaa138526 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-03-01 10:35:20 +11:00
Chiss
7cf6391ddd Sheep Quest 
Double Gem Weekend
 2014-03-01 10:35:06 +11:00
Jonathan Williams
8550307904 Removed unnecessary mysql call on client login. 2014-02-28 13:22:30 -08:00
Jonathan Williams
c2044f7e8a Added horse disguise. 
Added Hub redirect on full.
Fixed Repo for ServerMonitor.
Fixed Bridge QuitOut/AutoBalance issue.

Removed unnecessary region folder create in dominate.
 2014-02-28 01:18:32 -08:00
Jonathan Williams
f2570caad5 Swapped default connections to new dns names. 
Fixed bug with LobbyBalancer and retrieving no lobbies.
 2014-02-21 13:32:14 -08:00
Jonathan Williams
55c9a85763 Fixed Dynamic Server monitor stuff. 
Fixed EnjinTranslator Gem command.
 2014-02-18 00:40:41 -08:00
Jonathan Williams
ac8748312f Fixed Account login issues....Nasty LoadNavigationProperties() 
Tweaked dynamic server monitor sleep ordering to prevent multiple duplicate starts on boxes.
 2014-02-14 13:39:24 -06:00
Jonathan Williams
95210de788 Added auto restart for Dominate if startup errored. 
Added extra check for <= 1 players in Dom game to shutdown.
Added 5 second delay to Dom kick after game finish.
 2014-02-12 02:31:35 -08:00
Jonathan Williams
a75ced170c Added whitelist check in CoreClientManager 2014-02-10 02:04:20 -08:00
Jonathan Williams
525df6c2b0 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-02-07 09:46:54 -08:00
Jonathan Williams
516e5f7f99 Moved Rejoin ability into TeamGame. 
Added autobalance flag for game.
Punish only does exact name lookup.
 2014-02-07 08:50:13 -08:00
Chiss
b776c1bf60 spacehelemettts 2014-01-22 08:28:06 +11:00
Chiss
d868c9b73d fixed gold blocks being destroyed. 2014-01-22 08:02:01 +11:00
Chiss
567b7c4a7b minor fixes 2014-01-21 23:14:23 +11:00
Chiss
9118e79d9a Minor fixes 2014-01-21 22:57:49 +11:00
Chiss
b0ea211ae3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-01-21 22:52:05 +11:00
Chiss
e124dde006 Finished Gravity 
INcluded map
 2014-01-21 22:48:18 +11:00
Jonathan Williams
6f43d91bcf Added Vegetate for Bat. 
Added missing ProcessRunner.java
 2014-01-20 21:01:52 -06:00
Jonathan Williams
0fba94f8ae Derp 2014-01-20 20:22:59 -06:00
Jonathan Williams
f657b8a3ac Added isFlying and setFlying to DisguiseBat 2014-01-20 20:18:09 -06:00
Chiss
bdb7f3cc28 UHC season 5 2014-01-21 11:56:35 +11:00
Chiss
76b2baf626 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-01-21 11:28:37 +11:00
Chiss
7bbfdd1a42 Gravity Update 2014-01-21 11:28:12 +11:00
Jonathan Williams
dea96a9e65 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-01-18 09:08:12 -06:00
Jonathan Williams
177f4a878b Removed bad eventhandler line 
Refactored StatsManager
Removed Pvp Table add for StatsManager
Added commented out hooks for HG stats
 2014-01-18 09:02:56 -06:00
Chiss
75669e2333 Hub News Changes 
AntiHack Autokick for Severe Hackers
 2014-01-18 20:33:38 +11:00
Chiss
1333f2ee9f SSM Horse Disabled 2014-01-18 12:56:00 +11:00
Chiss
1031846198 SSM Update 
Gravity game start
 2014-01-18 12:34:24 +11:00
Jonathan Williams
8e51e4061a Reverted Hub. 
Fixed server monitor issues.
 2014-01-14 02:04:06 -06:00
Jonathan Williams
ea320e7f5b Removed Client cleanup. 
Modified server monitor process handling.
 2014-01-08 15:18:52 -05:00
Jonathan Williams
6904f9cf3d Minor verbage "Starting in 1 Second." 
Fixed NPE in client cleanup.
 2014-01-03 05:50:05 -05:00
Jonathan Williams
faea1072a1 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-01-03 01:37:49 -05:00
Jonathan Williams
93c0575fe2 Fixed naming in some hub modules. 
Fixed StatusManager ip and DynamicServer comparison.

Tweaked Bungee Lobby selection so it doesn't select a Lobby with < 10 slots left
Added client cleanup in CoreClientManager
Added Paintball cleanup
Added AntiHack ignore list cleanup.
Added clearDisguises call in DisguiseManager
Added ServerMonitor tracking based on Private Address.
 2014-01-03 01:37:39 -05:00
Jonathan Williams
dd7b178a9f Fixed Hero rank in EnjinTranslator 2013-12-26 19:44:36 -05:00
Chiss
fa2e24d686 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
 2013-12-25 09:08:03 +11:00
Chiss
375d689cc6 fixed visual bug with hero gems 2013-12-25 09:06:22 +11:00
Jonathan Williams
3fefc8fa73 Fixed Hero message in Arcade. 2013-12-24 04:13:52 -05:00
Chiss
f510083e7e formatting 2013-12-24 19:26:30 +11:00
Chiss
d25487d545 Rank color 2013-12-24 19:21:21 +11:00
Chiss
d92515eef9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-24 19:14:54 +11:00
Chiss
74e49a3ff1 Hero Rank stuff 
New SSM Kit
 2013-12-24 19:14:40 +11:00
Jonathan Williams
592d49e57c Added ghost check flag to ender dragon. 
Re-enabled Dragon Gadget.
 2013-12-24 03:09:15 -05:00
Jonathan Williams
6595d33899 Tuned chunk load for disguise manager. 
Disabled dynamic text in hub.
 2013-12-24 00:39:33 -05:00
Jonathan Williams
e60f52ff9c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-23 04:17:06 -05:00
Jonathan Williams
79de7f2bfc Fixed portal breaking with Frost horse. 
Added memory clean up for disguises
 2013-12-23 04:16:53 -05:00
Chiss
200504ec8b made snowman boss a little tougher. 2013-12-22 00:10:15 +11:00
Chiss
b895c66005 snake even more easy 2013-12-22 00:02:38 +11:00
Chiss
3bd7a7cd1f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-22 00:01:24 +11:00
Chiss
2f063e9f8e wave 3 snowman invul fix 2013-12-21 23:54:10 +11:00
Jonathan Williams
a02ca4513e Added undead/batgun and frost to in game shop for gems. 2013-12-21 07:29:04 -05:00
Chiss
e94784a908 dragon mount removed 2013-12-21 23:09:49 +11:00
Chiss
d6c37055da cleaner leak fix. 2013-12-21 23:06:27 +11:00
Chiss
1c3d90a70f leak fixes 2013-12-21 23:00:51 +11:00
Chiss
58e049acf9 snake bit is easier :) 2013-12-21 22:34:04 +11:00
Chiss
c08b7c7b96 hub news update 2013-12-21 22:21:16 +11:00
Chiss
bfd76474e8 Dragon particles 2013-12-21 20:44:56 +11:00
Chiss
a6eb7ea665 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-21 20:07:04 +11:00
Chiss
0585116e78 Hub Gadgets 
Hub Dragon (Hero Only)
XMAS block efficiency
 2013-12-21 20:05:42 +11:00
Jonathan Williams
793b17e878 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-21 03:23:07 -05:00
Jonathan Williams
7574a5972b Prevented sounds from silenced vegetables. 2013-12-21 03:22:58 -05:00
Chiss
c969775df3 Hub gadgets for xmas 2013-12-21 19:00:30 +11:00
Jonathan Williams
5fffcf89b6 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-21 02:44:20 -05:00
Jonathan Williams
70c14268e1 Fixed Leash issue. 
Added invis for utilent.ghost
 2013-12-21 02:44:12 -05:00
Chiss
f50ae06dff NPE fix 2013-12-21 16:52:59 +11:00
Chiss
50c2b10b50 25% easier boss 2013-12-21 15:10:17 +11:00
Chiss
c52a7d2fe1 Christmas update 
Hub Update
 2013-12-21 15:06:01 +11:00
Chiss
bc9c309aa1 Xmas Game 2013-12-21 10:17:22 +11:00
Chiss
5dc0a7d4d6 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-21 08:43:02 +11:00
Chiss
ac723c14bd Push so i can pull :O 
just some xmas stuff
 2013-12-21 08:42:49 +11:00
Jonathan Williams
f504cb5a8d Added vegetation to horse. 
Added Leash method to UtilEnt
 2013-12-20 03:52:43 -05:00
Jonathan Williams
379b0d0d75 Check for PullWhileLeashed in EntityCreature. 2013-12-20 03:14:18 -05:00
Jonathan Williams
44145e01f0 Removed weather for hub update. 2013-12-18 13:52:44 -05:00
Jonathan Williams
a24e8e233c Enabled pvp in hub for snowballs. 2013-12-18 05:56:59 -05:00
Chiss
6b33306755 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-18 21:46:40 +11:00
Jonathan Williams
e55885c85d itsy 2013-12-18 05:22:40 -05:00
Chiss
f4edcedce3 push so i can pull :\? 2013-12-18 21:17:28 +11:00
Jonathan Williams
0ba8349e03 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-18 04:48:24 -05:00
Jonathan Williams
64dab19003 Cleanup 
Prep work on leash disable functionality.
 2013-12-18 04:48:16 -05:00
Chiss
54f2cb3467 Christmas hub snowman target cancel 2013-12-18 19:58:39 +11:00
Jonathan Williams
ab8013091d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2013-12-17 11:10:11 -05:00
Jonathan Williams
938e72b06d Remove tourney stats. 2013-12-17 11:09:36 -05:00
Chiss
de99a642d3 Hub tourney text removal 2013-12-17 11:06:04 +11:00
Chiss
4bef100c6a Xmas Hub 2013-12-16 14:32:51 +11:00
Chiss
c582b210b5 Hub + Stats + Tournament 2013-12-14 16:51:08 +11:00
Chiss
3ca67d60c0 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-14 16:38:46 +11:00
Chiss
9af8676307 Hub/Stats 2013-12-14 16:38:16 +11:00
Jonathan Williams
ac049e0397 FINE JUST FINE>>>>>> STUPID CHICKENS 2013-12-13 21:36:57 -08:00
Jonathan Williams
69fa9eaba5 Added getters for stats/StatsManager.java 2013-12-13 21:35:04 -08:00
Jonathan Williams
e054b06cc2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-13 21:01:08 -08:00
Jonathan Williams
6b92b6c4a8 Added stats manager. 
Added lots of missing files.
 2013-12-13 21:00:56 -08:00
Chiss
1eebed737e Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
 2013-12-13 18:05:08 +11:00
Chiss
5f2e457362 Minor HG Stuffs ;o 2013-12-13 16:21:39 +11:00
Jonathan Williams
d6544202f0 Added ghost ability for mobs. 2013-12-12 02:19:58 -08:00
Chiss
97d8923678 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-07 23:04:59 +11:00
Chiss
2fb4bc4fbc UHC stuff 2013-12-07 23:04:10 +11:00
Jonathan Williams
9382271315 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-06 01:57:18 -08:00
Jonathan Williams
03627eb0c3 Changed all mysql connections to be persistent. 2013-12-06 01:57:09 -08:00
Chiss
db7b4f3a40 more draw words 2013-12-04 15:25:18 +11:00
Chiss
00bccdc1f7 More draw words 
UHC complete! probably not :'(
 2013-12-04 13:31:23 +11:00
Chiss
a29cc4664f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
 2013-12-04 12:48:12 +11:00
Chiss
28c928b4c3 Xmas + UHC changes 2013-12-04 12:45:17 +11:00
Jonathan Williams
8984309c56 Cleaned up portal cancellation. 2013-12-03 17:41:58 -08:00
Jonathan Williams
022c343a98 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
 2013-12-03 13:58:28 -08:00
Jonathan Williams
09a77e98cc Prevent Enderdragon from creating portal. 2013-12-03 13:57:43 -08:00
Chiss
36a98d5e41 UHC changes 2013-12-03 21:31:02 +11:00
Chiss
f972418fd1 UHC! 2013-12-03 17:13:29 +11:00
Chiss
d10871abd9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-03 16:27:12 +11:00
Chiss
43196dd7af UHC Update 2013-12-03 16:26:47 +11:00
Jonathan Williams
ce4eb43145 UHC end transfer. 2013-12-02 21:20:28 -08:00
Jonathan Williams
27c79e7c92 Turned lobby balancer back to US 
Added Draw map
 2013-11-30 16:38:02 -08:00
Chiss
f4e3b6efdc hub news/skytext for draw game 2013-11-30 22:11:26 +11:00
Chiss
c8fc792fdd UHC prep for s4 
Draw updates
 2013-11-30 20:40:09 +11:00
Chiss
8807854b57 Added Draw 2013-11-29 23:38:38 +11:00
Chiss
f927f2c1be wolf tackle fix 
HG furnace no use
 2013-11-27 12:48:16 +11:00
Chiss
0d811272cc final HG fix :D 2013-11-27 11:52:20 +11:00
Chiss
6f06ac2018 HG lag fixes 
item frames cannot be broken
creep damage messages
 2013-11-26 23:54:02 +11:00
Jonathan Williams
25782813f4 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-26 02:35:05 -08:00
Jonathan Williams
9a7a815a21 Added multiblock packets only for sg. 
RE-tweaked loot.
Fixed blocks pawns in lobby.
 2013-11-26 02:34:54 -08:00
Chiss
e57722ed0b HG snowball fix 2013-11-26 12:02:03 +11:00
Chiss
48e392fdf0 HG; 
-compass
-deathmatch
-various fixes
 2013-11-25 20:59:46 +11:00
Chiss
e469c5705b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-25 10:23:28 +11:00
Chiss
b941359840 HG 2013-11-25 10:23:10 +11:00
Jonathan Williams
2ebf13aba6 Added commented out chunk change stuff. 2013-11-24 15:22:29 -08:00
Jonathan Williams
e2646a982f Added MultiBlock packet. 
Tweaked performance for chunks that are < 64 changes for HungerGames.
 2013-11-24 04:54:41 -08:00
Jonathan Williams
0a1f4ecfd5 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-24 03:04:07 -08:00
Chiss
276898dced HG 2013-11-24 21:58:55 +11:00
Jonathan Williams
8d19f3ecac Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-24 02:44:59 -08:00
Jonathan Williams
dbd7820279 Loot tweak. 2013-11-24 02:44:52 -08:00
Chiss
4c7e42760b debugz 2013-11-24 21:44:43 +11:00
Chiss
83bec39aef game not end 2013-11-24 21:36:35 +11:00
Chiss
c9e1c0a0f4 HG lag fix 2013-11-24 21:29:49 +11:00
Chiss
fd63a0a0b1 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-23 23:59:04 +11:00
Chiss
2a41979277 HG Lag Fixes! 2013-11-23 23:58:51 +11:00
Jonathan Williams
e04815f077 Removed Beta ultra only checking in server NPc page. 2013-11-23 02:40:56 -08:00
Jonathan Williams
b0bfa860c7 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-23 02:04:30 -08:00
Jonathan Williams
ae779d063e Added quick menu buttons for Block Hunt and Survival Games 2013-11-23 02:04:22 -08:00
Chiss
f299b4f650 hub changes 2013-11-23 20:55:01 +11:00
Jonathan Williams
7752d0e8a2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-23 00:57:54 -08:00
Jonathan Williams
11378f967f Fixed npc page ultra beta stuff. 2013-11-23 00:39:32 -08:00
Chiss
0d7444f35a TNT Damage off 2013-11-23 19:38:58 +11:00
Chiss
e6080c9192 drop fixes 2013-11-23 18:39:26 +11:00
Chiss
d5ae42910f OOPDOOTS 2013-11-23 18:19:26 +11:00