1d4d98b910
Twitch Prep
...
MAC changes
2014-05-02 14:35:41 +10:00
c1360c63f0
More strikes for auto-kick
...
Updated MAC kick message
2014-05-01 09:38:37 +10:00
a17c1aca44
Allow more for lag in MAC
2014-05-01 09:36:30 +10:00
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
423a355057
Helpers+ wont be kicked yb MAC
2014-05-01 09:31:47 +10:00
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
7637d94ae0
Added mysql logger.
...
Hooked it up in a few places.
Fixed Asynch crap with AntiHack.
2014-04-30 00:31:22 -07:00
42e9fe879c
Fix for party filtered party messages going to everyone.
2014-04-29 13:45:38 -07:00
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
cee2883786
Added some verbage around command center block.
...
Fixed async chat connection stuff.
2014-04-29 12:13:32 -07:00
3ec1653532
Added in chat filtering command and finished up filtration.
2014-04-29 11:54:20 -07:00
1bcdc71c14
Added ping logging to Antihack reports.
2014-04-28 01:53:02 -07:00
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
66aa7223cc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-27 21:59:35 -07:00
47417dea6b
Implemented initial SafeChat.
2014-04-27 21:59:18 -07:00
dc6a3da0fa
Added more DMT words
2014-04-28 14:08:40 +10:00
77809b409d
MAC Update
2014-04-28 12:28:48 +10:00
c5509f870f
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-28 09:43:18 +10:00
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
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
0e72d1c1eb
Added extra sleep to monitor because servers take longer to startup with spigot.
2014-04-26 09:21:51 -07:00
7b264b0867
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-26 09:21:11 -07:00
82afefd11a
Quick fix for respawning players not being able to get stuff from creative inventory
2014-04-27 01:09:25 +10:00
2b4c0135bf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-26 02:47:19 -07:00
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
95d6ec7f50
Barrage fix
2014-04-26 17:25:35 +10:00
07ca3a83ca
Arrows shouldnt bounce
2014-04-26 13:37:01 +10:00
b86b014058
Fixed a whole bunch of bugs
2014-04-26 11:59:11 +10:00
9a3b73a137
Add new file, removed insentient a(groupdata call
2014-04-25 17:53:31 -07:00
ac1c081bc8
Fixed scoreboard issues.
2014-04-25 17:52:04 -07:00
a37ace7576
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-25 00:44:27 -07:00
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
8229925fca
HUB NEWS
2014-04-25 17:37:42 +10:00
9495630bf2
CP rate increase
2014-04-25 11:10:37 +10:00
7fef4adbee
Fixed resupply resetting skills.
2014-04-22 22:19:03 -07:00
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
7ea601e94b
Cant open bridge chests until bridges are down.
2014-04-23 10:38:59 +10:00
0325892e2a
Champs water fixes
...
First push for Twitch games
2014-04-23 10:21:01 +10:00
e62dfb0dd2
Fix skill/item packs not deducting gems.
...
Fix players not getting spectating flag when dying.
2014-04-22 16:50:44 -07:00
7680eaaedc
Fixed non-Ultra being able to unlock spells/skills.
...
Fixed Items that weren't free.
2014-04-22 11:20:00 -07:00
2378df6191
Fixed builds losing tokens.
2014-04-22 10:35:56 -07:00
923d2455d0
Stampede ends immediately on taking damage
2014-04-21 17:21:52 +10:00
bddc36271d
fixed gems for capture
2014-04-21 17:16:35 +10:00
6ee516ba4a
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-21 17:14:34 +10:00
0f31052d00
cannot shoot arrow in water.
...
less gems for capping
2014-04-21 17:14:23 +10:00
2e0e033ba3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-21 00:12:17 -07:00
75b44953bf
Fixed arrow bounce.
2014-04-21 00:12:00 -07:00
62c245d728
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-21 17:06:08 +10:00
0f0b66a8cf
Stampede cancel on damage taken
2014-04-21 17:04:51 +10:00
a150249f4f
game will not announce winner multiple times
2014-04-21 17:01:50 +10:00
9ce6d4866d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-20 23:37:01 -07:00
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
adf8821a26
more CP changes
2014-04-21 12:55:24 +10:00
b1e082b73a
fixed riposte bug
...
tweaked capture effects
2014-04-21 11:56:14 +10:00
0eaa3110f5
Risposte nerf
2014-04-21 11:18:14 +10:00
b8e573e8f8
redid capture display. much less annoying.
2014-04-21 11:15:49 +10:00
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
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
3281eb2ed7
Merge
2014-04-21 08:47:07 +10:00
60039d5b76
More missing files.
2014-04-20 01:07:59 -07:00
8bf40169f3
Added missing files.
2014-04-20 01:06:55 -07:00
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
1f225f05ff
Custom build fixes.
2014-04-20 00:27:32 -07:00
dc625726c4
Item Custom Build Fixes.
2014-04-19 22:54:52 -07:00
458f5741d7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-19 20:54:04 -07:00
e5e9cc7284
Custom Items in custom Builds for dom.
2014-04-19 20:53:55 -07:00
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
de2b42e190
fixed tnt bug
2014-04-19 15:18:13 +10:00
b720a6433c
Explosions crack carved stone brick
2014-04-19 15:10:30 +10:00
1bf1f04d53
Champs Stuff
2014-04-19 14:50:14 +10:00
424f915388
Champs Merge
2014-04-18 13:24:30 +10:00
6b07541b3b
DERP JONLONS
2014-04-15 18:40:43 -07:00
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
81ab27cd83
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-14 17:09:47 -07:00
6c8651d2c7
Fixed classes not being added.
2014-04-14 17:09:37 -07:00
1c23cf7b4e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-14 09:27:44 +10:00
e5ea7483db
Merge
2014-04-14 09:27:31 +10:00
d3a3cc278f
Fixed ultra custom builds not saving.
...
Fixed default builds.
Fixed armor bug.
2014-04-13 04:24:22 -07:00
591caa1589
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-13 01:36:46 -07:00
cac59afed4
Fixed bug with missing default skill and kit page opening.
2014-04-13 01:36:34 -07:00
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
9874dae60f
Merge
2014-04-13 18:00:53 +10:00
5efaf9bd36
Fixed inf loop.
2014-04-13 00:59:55 -07:00
b22be81cbb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 17:49:44 +10:00
8b159557b2
Added PvpClass set in default customBuild.
2014-04-13 00:49:16 -07:00
d087b379d1
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 17:21:02 +10:00
85aa748218
Champs Bug Fixes
2014-04-13 17:20:49 +10:00
d84c234f47
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-13 00:16:07 -07:00
1b25dce2c5
Added default application on setGameClass.
...
Removed print info on custom build saving.
2014-04-13 00:15:44 -07:00
081da93bbd
blocked /bukkit:me
2014-04-13 11:19:16 +10:00
f25a6c26c9
Champs Update
2014-04-13 11:06:10 +10:00
154479d1b7
Fixed TDM health
2014-04-13 09:29:22 +10:00
f73d4d3e23
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-13 09:29:12 +10:00
2e4bc587b1
Champs Update
2014-04-13 09:26:31 +10:00
1cb35262ac
Fixed skill tokens not being returned.
2014-04-12 14:02:40 -07:00
98430be09e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-12 01:45:01 -07:00
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
ecc40bda47
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-12 18:25:59 +10:00
ba1c6ae35f
Champs Balance
2014-04-12 18:22:53 +10:00
eb1d1c1ed2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-11 03:10:02 -07:00
c8af89dded
Fixed BH and GRavity.
2014-04-11 03:09:21 -07:00
80df2c2944
Bux fixes for 1.7
...
Champions TDM
SSM Domination
2014-04-11 15:33:31 +10:00
71b2931936
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-11 10:34:51 +10:00
2adf0395a1
Merge
2014-04-11 10:33:56 +10:00
0375384fb5
Converted to Spigot's latest 1.7.5
2014-04-10 17:15:44 -07:00
a26894fda6
Added missing file.
2014-04-09 21:38:12 -07:00
84ffd56c82
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-09 02:50:46 -07:00
8460fcc8f6
Added ninja check for bow charge if you just right click quickly.
2014-04-09 02:50:37 -07:00
b64acf524c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-09 19:07:22 +10:00
b868db0f22
Fixed so you can now charge bow skills in air.
2014-04-09 19:07:12 +10:00
e4ca9084cc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-09 02:03:41 -07:00
ec29c66d1c
Added arrows sticking in you.
...
Removed bouncing arrows.
2014-04-09 02:03:19 -07:00
146202a52c
Champs Balance + Red Arrow Fix
2014-04-09 18:50:38 +10:00
7d59f43ffa
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-04-09 16:48:14 +10:00
0ecd38c656
Champs Balance
2014-04-09 16:48:01 +10:00
bedabd84cc
Added silence to kits (UtilEnt.silence)
...
Cleaned up a ton of unused code....
2014-04-08 23:31:32 -07:00
e8260b20f7
Fixed dragon spawn location for text util.
2014-04-07 23:35:45 -04:00
9b4e1aa9eb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-07 22:25:08 -04:00
109d2cb6f1
Fixed edit build issue.
2014-04-07 22:18:04 -04:00
2eaaa85e04
Fixed /game stop trapping players in dead world.
2014-04-08 12:08:59 +10:00
bb3f2c6281
CHAMPS
2014-04-08 10:53:41 +10:00
85c57f2942
IButton now has Left/Right
...
Added right-click skill removal.
2014-04-06 12:45:52 +10:00
88131836d7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-05 16:01:07 -04:00
db2ae49074
Fixed saving custom builds.
...
Work on skill tokens.
2014-04-05 15:53:22 -04:00
8214e3b8f4
Lots of little bug fixes
2014-04-05 16:52:23 +11:00
05d916de3c
Fixed custombuild selection not applying armor
2014-04-04 15:57:56 -04:00
ddcc8a26b3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-04-04 15:02:42 -04:00
edfe23fb01
Fixed collision with Projectiles.
2014-04-04 15:02:13 -04:00
13b8f1e7ea
Champs Update
2014-04-04 13:26:00 +11:00
26fe974b00
More CHamps
2014-04-03 15:48:58 +11:00
80c153095b
Cooldown bar
2014-04-02 22:03:56 +11:00
2f0167ea09
Champs Update
2014-04-02 21:22:21 +11:00
2aaf749414
Champions Update
2014-04-02 15:19:58 +11:00
afc26e21e3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-29 18:46:52 -04:00
06bdc22c89
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-29 18:45:53 -04:00
0f937b165c
skill shop stuff
2014-03-30 09:45:53 +11:00
d227a6bd06
Changed full server message
2014-03-29 18:45:44 -04:00
e1eda749a7
Skill lore changes
2014-03-30 09:05:29 +11:00
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
f4e8879d55
skilly test stuff
2014-03-29 17:07:07 +11:00
195e555a6e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-29 01:33:18 -04:00
6963f6bacf
Added Player version stat tracking.
...
Added server group stats.
2014-03-29 01:32:24 -04:00
fce249d7d8
fixed some desc stuff
...
castle seige removed OP kit
2014-03-28 18:50:38 +11:00
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
f5ca6408f8
Merge?
2014-03-28 14:51:26 +11:00
aae40d3899
Changed up Skills and SkillsPage for Dom 2 changeover.
...
Fixed CustomBuild stuff.
2014-03-27 22:17:31 -04:00
47feabcad3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-28 10:06:03 +11:00
17e6658437
Fixed up AntiHack database reporting.
2014-03-24 01:16:02 -07:00
2680edbd85
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-24 16:15:29 +11:00
2450265909
Fixed damage rate limiting for mobs.
2014-03-22 00:16:51 -07:00
e4a86e0600
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-22 10:45:01 +11:00
fe09c3fc49
More CS Update
2014-03-22 10:44:31 +11:00
8bf78fe14d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-21 15:30:06 -07:00
33d342b049
updated 1.7 stuff.
2014-03-21 10:57:31 -07:00
ab2a72ba16
CS Update
2014-03-21 11:59:56 +11:00
f24f81b7c3
Finished conversion.
2014-03-19 04:09:40 -07:00
515a01fd7d
Updated utils.
2014-03-19 02:40:36 -07:00
7f58453688
Updated Particle.
2014-03-19 02:25:28 -07:00
7042159f46
Updated to 1.7 and changed namespaces to 1.7
2014-03-19 02:24:26 -07:00
98baef09bf
Added 1.7 files.
...
Removed 1.6 files.
2014-03-19 00:58:43 -07:00
a7888b0c02
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-19 17:51:48 +11:00
7714ff4a09
CS Update
2014-03-19 17:51:37 +11:00
24f1c6c722
Fixed saving custom builds.
...
Fixed items staying from previous class in game.
2014-03-18 23:40:54 -07:00
9715f5454a
Removed double gems.
...
Removed unused code for ssm time
2014-03-18 12:55:04 -07:00
6830033d8a
PLEASE JUST WORK :(
2014-03-16 10:52:34 +11:00
d6e3f076cd
PLEASE JUST WORK MR TORTOISE
2014-03-16 10:42:30 +11:00
3277a0a2f8
Making sure puushed
2014-03-16 10:35:58 +11:00
d695ec72ca
Added SSM Team Game
2014-03-16 10:28:46 +11:00
3603d3ef8b
Removed afk kick from arcade.
2014-03-14 21:49:01 -07:00
0094c0ebeb
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-14 02:20:01 -07:00
246f28a464
Enabled DoubleGem weekend.
...
Added 3 new maps
updated news
2014-03-14 02:19:52 -07:00
aa206d9c91
Gravity fixes
2014-03-14 20:17:06 +11:00
24efe3d0d8
SQ kit restrictions
2014-03-14 13:24:38 +11:00
de1365b5cf
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-13 17:56:16 -07:00
efee9fdcbf
Fixed Hub class shop.
...
Added chat logging.
Added message with file updater.
2014-03-13 17:56:05 -07:00
f4cd2fcbb9
Staggered game teleports/start
2014-03-13 18:18:22 +11:00
27f554ab61
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-13 16:33:03 +11:00
82644002c5
A little bit o dem ol bug fixles. yknow what im sayin?
2014-03-13 16:32:48 +11:00
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
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
f277b1da23
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-03-09 19:43:14 -07:00
02a1e68c8c
Fixed kits opening correct page.
2014-03-09 19:42:54 -07:00
105b210afa
mob spawnin'
2014-03-10 13:42:05 +11:00
464fdb1e5e
Renamed Champions to Dominate
2014-03-10 13:35:36 +11:00
8593eb326e
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-03-10 13:32:52 +11:00
1bc5fef625
Kit npc location change
2014-03-10 13:32:39 +11:00
a565da45e4
Added classes to champions.
...
Added ability to open direct classes page.
2014-03-09 19:32:27 -07:00
f51a6747fd
Moved files into Mineplex.core
...
Removed references to Core project.
2014-03-09 00:50:13 -08:00
2cc50d5725
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-06 02:15:46 -08:00
d05c2f906c
Fix for ServerNpc page beta join.
...
Work on Dom 2.0
Added sheep quest map.
2014-03-06 02:15:16 -08:00
60bc3f15bb
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-05 14:35:01 -08:00
c9a938d2c5
Sheep Quest Fixes
2014-03-05 14:34:51 -08:00
a09a2aaa30
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-05 00:40:51 -08:00
f0b347f97f
Changed beta testing to Ultra and up.
...
Did some work on DOM 2.0
2014-03-05 00:34:20 -08:00
af2cf4e7a9
this is the one change i needed to push
2014-03-04 23:27:37 -08:00
2b56b970fa
Sheep Game?
2014-03-04 22:39:48 -08:00
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
b3f10b9d62
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2014-03-01 01:59:25 -08:00
750fff32c7
Added Skeletal horse.
2014-03-01 01:58:58 -08:00
b54e4dfbc4
hunger
2014-03-01 11:29:01 +11:00
Chiss
Jonathan Williams