d5ea6c5377
Removed dead project ServerStatus
...
Tweaked connection strings so they autoreconnect.
Added dragon sound to pre-queue prompt.
Added rest of missing files.
2014-05-28 11:18:30 -07:00
24ccf133af
Fixed bug with Portal where it continuously sent players until queue cleaned up records 15 seconds later.
2014-05-28 10:43:39 -07:00
449fa13cc3
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
...
Conflicts:
.gitignore
2014-05-27 02:23:22 -07:00
0634ee5543
Removed unused global stuff in Mineplexer.
...
Did some edits in GroupManager...need to pick that up.
Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection
Work on Elo manager.
Work on Queue.
Added checking for player to server transfer records.
Added option for rejoin time in TeamGame (UHC...yay)
2014-05-27 02:10:29 -07:00
49de140f41
Configured eclipse to use UTF-8
2014-05-25 21:04:14 -04:00
8c19d618b6
Added missing dependency in intellij setup
2014-05-25 20:51:27 -04:00
c45e7d2a80
Converted file encoding from ISO-8859-1 to UTF-8
2014-05-25 19:42:39 -04:00
3859a42f1d
Removed broken and obsolete shifter code
...
Set up more intellij stuff
2014-05-25 19:11:58 -04:00
aa6b5324eb
Set up IntelliJ IDEA
2014-05-20 00:39:50 -04:00
6d19c80af2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-13 22:15:55 -05:00
6af5d9205b
Added TimeUtil.java
...
Removed double gems.
Removed extra world uninitialize.
Changed AccountAdministrator to use UUID.
2014-05-13 22:13:48 -05:00
002260dce8
better date
2014-05-14 12:57:43 +10:00
12041b0d72
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-13 21:54:58 -05:00
8ea344cacd
fixed a NPE
2014-05-14 12:38:06 +10:00
40ba1a64f8
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-13 14:46:15 -05:00
97abe79ffa
armorgadgets disable fix
2014-05-13 12:23:29 +10:00
8c3deeba49
Hub Commands (/forcefield and /gadget)
2014-05-13 12:08:56 +10:00
fbb0031dc1
fixed bug in dom where endCheck was being called multiple times
...
logging for world stuff
2014-05-13 11:18:17 +10:00
b1514fef5a
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-09 21:18:48 -07:00
0ec08d5208
Fixed chunk load outside borders (disabled for testing right now)
2014-05-09 21:18:38 -07:00
208a78b070
respawning players are tp'd if leave area.
2014-05-10 14:01:02 +10:00
d9225c003e
CS Update
2014-05-10 09:55:27 +10:00
8ee52be8da
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-08 20:01:31 -07:00
eae2d41fad
Fixed party out of bounds exception.
...
Fixed tnt in wrong place in dom shop.
2014-05-08 20:01:21 -07:00
e620618e69
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-05-09 12:58:42 +10:00
56ae8627f5
news changes
2014-05-09 12:58:29 +10:00
b72bcadbf4
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-06 22:38:50 -07:00
ebf40afe75
Fix dom bow shoot in lobby bug.
...
Work on preventing illegal builds.
2014-05-06 22:38:27 -07:00
e0dd0116a2
Beginning changes for stats from PlayerName to PlayerUUID
2014-05-06 17:06:19 -04:00
a9d3d31339
Fixed memory problem with CraftingManager and arcade worlds that should be unloaded but are still referenced.
2014-05-06 09:14:31 -07:00
56c0545659
Added elo files.
2014-05-06 09:08:22 -07:00
5f2b2c251d
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-06 09:06:49 -07:00
8110506ac4
Fixed duplicate login issue with CoreClientManager
...
Added EloRanking and EloStart for elo games in Game.java
Refactored Elo code in Arcade to be based off of above values in Game
Changed Lobby scoreboard in Arcade to just Players at top current/max.
2014-05-06 09:06:39 -07:00
f79b3b147c
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-05-06 15:59:20 +10:00
223da7bf4d
ResetAll for class skills
2014-05-06 15:55:14 +10:00
2f397e7d2a
Work on elo manager.
...
implemented coreclient cleanup.
2014-05-04 22:40:44 -07:00
f079333d3b
Optimized ChunkBlockChange.
...
Still no dead chunks!
Fixed LobbyManager advertising to an empty lobby.
2014-05-04 18:29:19 -07:00
97e083c1e7
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-04 12:52:14 -07:00
f623026dfc
Fixed projectile order issue..check for dead before collision.
...
Fixed dead chunks in Aracde.
2014-05-04 12:52:04 -07:00
a9f4a900f0
Working on fixing dead chunks.
...
Fixed Blizzard memory issue.
2014-05-04 09:31:04 -07:00
3c2fc4c49b
Fixed MAC not being disabled
2014-05-03 17:29:55 +10:00
6e8bdfa769
disabled hub clock for tournament
2014-05-03 17:26:21 +10:00
0ce3b3fb2d
Disabled AFK kick during Tournament
2014-05-03 17:23:10 +10:00
fe7ed5c96a
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-02 23:19:05 -07:00
b432c094d9
Misisng ifles
2014-05-03 16:16:52 +10:00
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
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
4304327bf9
Disallowed /spec during games.
2014-05-03 13:06:15 +10:00
395a5d2c08
MAC disabled with Tournament Mode
...
Bridges TM game desc fix
2014-05-03 11:47:15 +10:00
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
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
Jonathan Williams
CoderTim
Chiss
Peter Miller