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

532 Commits

Author SHA1 Message Date
Chiss
6e8bdfa769 disabled hub clock for tournament 2014-05-03 17:26:21 +10:00
Chiss
0ce3b3fb2d Disabled AFK kick during Tournament 2014-05-03 17:23:10 +10:00
Jonathan Williams
fe7ed5c96a Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-02 23:19:05 -07:00
Chiss
b432c094d9 Misisng ifles 2014-05-03 16:16:52 +10:00
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
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
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
3ec1653532 Added in chat filtering command and finished up filtration. 2014-04-29 11:54:20 -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
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
Chiss
82afefd11a Quick fix for respawning players not being able to get stuff from creative inventory 2014-04-27 01:09:25 +10:00
Chiss
95d6ec7f50 Barrage fix 2014-04-26 17:25:35 +10:00
Chiss
b86b014058 Fixed a whole bunch of bugs 2014-04-26 11:59:11 +10: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
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
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
Chiss
bddc36271d fixed gems for capture 2014-04-21 17:16:35 +10:00
Chiss
0f31052d00 cannot shoot arrow in water. 
less gems for capping
 2014-04-21 17:14:23 +10:00
Chiss
a150249f4f game will not announce winner multiple times 2014-04-21 17:01:50 +10: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
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
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
Chiss
e5ea7483db Merge 2014-04-14 09:27:31 +10: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
85aa748218 Champs Bug Fixes 2014-04-13 17:20:49 +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
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
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
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
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
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
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
d227a6bd06 Changed full server message 2014-03-29 18:45:44 -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
Jonathan Williams
aae40d3899 Changed up Skills and SkillsPage for Dom 2 changeover. 
Fixed CustomBuild stuff.
 2014-03-27 22:17:31 -04: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
7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -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
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
82644002c5 A little bit o dem ol bug fixles. yknow what im sayin? 2014-03-13 16:32:48 +11: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
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
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
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
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
e124dde006 Finished Gravity 
INcluded map
 2014-01-21 22:48:18 +11: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