f0d2ff1c9d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 17:44:36 -08:00
500e37a618
fixed ender chest shop item
2015-02-11 14:44:14 +13:00
92d3a7dab8
all chests purchasable by coins
2015-02-11 14:42:41 +13:00
e03c65769d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-11 14:16:58 +13:00
cafa59d7e8
adjusted reward rarities
2015-02-11 14:16:08 +13:00
594f0c6045
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 17:15:06 -08:00
e21e27f07f
Merge remote-tracking branch 'origin/master'
2015-02-10 13:33:59 -05:00
6b3f2114f2
Holy debug code!
2015-02-10 13:27:29 -05:00
80a5acd9f2
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 04:18:05 -08:00
5a516e4c78
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-11 00:59:45 +13:00
77350e51de
Using the wrong servername in PlayerTracker
2015-02-11 00:58:21 +13:00
258c1ca7fc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 02:27:05 -08:00
d9521bd05a
lowered gameloot chances
2015-02-10 23:26:37 +13:00
ff10d0cb06
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 02:22:57 -08:00
246acc721a
Clans compiles now ;)
2015-02-10 02:22:47 -08:00
4c0e6642f4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-10 02:12:23 -08:00
3a912c13ec
Add nocheat to MPS
2015-02-10 02:11:27 -08:00
01173a2e13
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 19:12:56 +13:00
884df48695
disguise command (not yet working fully)
2015-02-10 19:08:54 +13:00
336ba50f59
Rename some enum values for treasures, update my packet change
2015-02-09 23:24:43 -05:00
cb9246281c
TEASURE! +R
2015-02-10 16:49:50 +13:00
37a5024fcd
more chest polish
2015-02-10 13:22:42 +13:00
04d0a1cba1
fixed lore
2015-02-10 12:40:51 +13:00
edddff503e
Treasure ready ;o
2015-02-10 12:38:08 +13:00
c1f9f94c2a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 12:23:28 +13:00
6bbf9bd321
Ability to purchase old chests
2015-02-10 12:23:11 +13:00
af95d3ba4e
Treasure update
2015-02-10 12:09:37 +13:00
c2c63f4fc0
Null check in MessageManager
2015-02-10 04:17:38 +13:00
29f3241098
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 02:32:13 +13:00
ce7db289a7
Add commands /ignore and /unignore. Fixed mutes not working with private messaging
2015-02-10 02:31:33 +13:00
cf0134a577
Change commandmanager to cancel event if command is registered, despite not having permissions
2015-02-10 02:20:54 +13:00
51e1798d8a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-09 00:19:15 -08:00
c5b7e97623
Added NoCheatPlus hooks.
2015-02-09 00:18:51 -08:00
fb563c9274
Fixed customer support whitelist names.
2015-02-09 00:16:20 -08:00
fcba1db291
Fixed server transfer bug.
2015-02-09 00:15:45 -08:00
f98d6e0534
Fixed personal servers overriding existing servergroups.
2015-02-09 00:15:18 -08:00
26463ba75d
Treasure changes :O
2015-02-09 20:24:20 +13:00
c285fae035
Merge remote-tracking branch 'origin/master'
2015-02-06 23:40:14 -05:00
b85494a037
Show player skins in friend gui
2015-02-06 23:40:06 -05:00
ed8638ae9f
Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it
2015-02-06 23:39:22 -05:00
219ac93dc4
Don't allow the server to increment the mapcount information.
2015-02-07 16:06:53 +13:00
c61f97d0eb
Why didn't this get included in that previous commit..
2015-02-07 03:54:19 +13:00
8851cccff4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-07 03:53:17 +13:00
68d1ba4507
Add API to create walls of maps to create a giant image. Please use responsibly.
2015-02-07 03:52:19 +13:00
de1d2d4688
Just ignore this commit. Nothing fancy here!
2015-02-06 00:42:17 -05:00
36b43af2c2
Fix inconsistency in friends gui
2015-02-06 00:14:46 -05:00
48db23c862
Fix for enderchests closing after being opened, go shaun!
2015-02-06 00:10:17 -05:00
922f2d5ee9
Merge remote-tracking branch 'origin/master'
2015-02-05 23:20:45 -05:00
fcb3d20778
Move tablist stuff to portal, show current server on tablist
2015-02-05 23:20:39 -05:00
2f64b5f401
1.8 tablist fix - spigot needs to be updated!
2015-02-05 23:09:20 -05:00
417122b7a7
reduced rate that smash crystal spawns
2015-02-06 14:47:34 +11:00
09b78fccd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-06 14:16:26 +11:00
14fc6f2145
Chest Update
2015-02-06 14:16:10 +11:00
f8885e4c5c
Merge remote-tracking branch 'origin/master'
2015-02-05 21:36:19 -05:00
d878e3940e
War state, handle time better, ability to have a server timezone (see ClanManager)
2015-02-05 21:36:07 -05:00
25548046d8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-05 23:42:41 +13:00
f549402712
Modify wizards to use | for bossbar displays
2015-02-05 23:42:26 +13:00
79cde8f5cf
fixed util textbottom for 1.8.2
2015-02-05 21:39:42 +11:00
64b79424d7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-05 22:34:34 +13:00
6f8d39b630
Fixed spiders climbing liquids
2015-02-05 22:34:06 +13:00
44bab01e33
Added NoCheatPlus hook for double jump fly hack prevention.
2015-02-04 21:52:14 -08:00
fabf385a57
Added exception handling for group change exceptions so entire dynamic monitor doesn't stop.
2015-02-04 21:41:33 -08:00
dbd6f449eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2015-02-05 11:37:35 +11:00
c7d4b14f4c
Revert "Revert "Work on treasure............""
...
This reverts commit 49bfe385bf
2015-02-05 11:34:29 +11:00
ea30645d42
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-04 18:37:32 +13:00
55b9435877
Change event used to track player's in bungee
2015-02-04 18:36:44 +13:00
0f23533f41
Fix typos in EnemyData
2015-02-03 23:18:42 -05:00
2060b74343
War death handling, more war logic, other fixes
2015-02-03 19:35:53 -05:00
b0be5b2510
Time code for war, server time command
2015-02-03 16:48:26 -05:00
3b324448b5
Fix errors in war manager
2015-02-03 14:19:22 -05:00
939c6189a7
Merge energy and war with master
2015-02-03 14:16:07 -05:00
bb197ff629
Merge War and Energy
2015-02-03 14:14:52 -05:00
b0a2e655c1
Changes to IntellIJ Files
2015-02-03 14:12:52 -05:00
6cefeb1b74
More work on War
2015-02-03 14:02:45 -05:00
87f038d21d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-03 22:03:26 +13:00
e91d76960c
Add a toggleable friends GUI - Chat to Inventory and back
2015-02-03 22:03:07 +13:00
f1930ed7c1
Only record bungee stats for your region...servermonitor
2015-02-01 00:56:18 -08:00
9118aef60f
Even if death is not the end, refuse players re-entry if they were in the lobby when they quit.
2015-02-01 16:03:29 +13:00
01fa5b5882
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-01 12:19:51 +13:00
ea24bc1d87
Prevent treasure chests being opened from interfering with portals, ladders, etc.
2015-02-01 12:19:33 +13:00
56fd245032
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-31 14:19:45 -08:00
9d3f5f9bc8
Fixed reconnect for bungee connection in StatusHistoryRepository
...
Added error catching to ServerMonitor so it doesn't stall program.
2015-01-31 14:19:33 -08:00
f9cbab6fd8
SuperSmash no longer restores hunger unless you damage a player, not a entity
2015-02-01 09:47:00 +13:00
4f9f0afa29
BlockToss can no longer pickup blocks next to ladders
2015-02-01 09:40:36 +13:00
6f369cbcdb
Sort players in spectator menu by name
2015-02-01 08:25:38 +13:00
eccc2f2fb0
Fixed bug with dropping gadget items interfering with games and being set in the wrong slot with the wrong name
2015-02-01 08:04:19 +13:00
0c2054ac32
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 20:49:51 +11:00
f03c9d5bab
Fixed damage rate on barrage
2015-01-30 20:48:46 +11:00
ff56578d15
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:29:12 -08:00
49bfe385bf
Revert "Work on treasure............"
...
This reverts commit 50a8fb03a9
2015-01-29 22:28:41 -08:00
ff73c88182
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 19:28:29 +13:00
a1529e0884
Notify player when no friends found when searching
2015-01-30 19:28:04 +13:00
352a29390b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:19:12 -08:00
ed08e4b112
Changed coloring for server line in friends gui.
2015-01-29 22:18:59 -08:00
115f9b58ab
Spider nest :)
2015-01-30 17:02:28 +11:00
9b5b1f635f
Merge remote-tracking branch 'origin/master'
2015-01-30 00:37:16 -05:00
96ce95b72e
treasure changes
2015-01-30 00:37:02 -05:00
5b112caa4a
Bone Storm buff
2015-01-30 16:10:03 +11:00
c066cb5185
Fixed Bugs
2015-01-30 16:08:22 +11:00
3fdf914d63
Smash Wolf Update!
2015-01-30 15:18:50 +11:00
76b76cd38c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 14:42:51 +11:00
c8afa151d9
SSM Zombie + Spider Update
2015-01-30 14:42:39 +11:00
79a60db15d
More tweaks
2015-01-29 22:41:54 -05:00
1cc0879ce9
treasure stuff
2015-01-29 22:17:46 -05:00
81a52184c9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 17:50:24 -08:00
b14d09ed2c
Reduced connection checking to every 2 minutes.
...
Removed kill script call as it was encountering access errors..
2015-01-29 17:47:59 -08:00
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
e18107a82f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 11:08:37 +11:00
6a269cc03b
More SSM Changes
2015-01-30 11:08:23 +11:00
50a8fb03a9
Work on treasure............
2015-01-29 18:37:29 -05:00
908533b232
Added some exception protection in Redis retrieve dedicated servers.
...
Removed Statifier project.
Improved ServerMonitor:
- Added recording of dedicated server stats
- Added recording of server group stats
- Added recording of bungee stats
- Added recording of network stats
2015-01-29 07:05:50 -08:00
ebc74e5565
Fireball still too fast
2015-01-29 15:01:00 +13:00
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
2dfdde4457
Kit mage will now start with two spells
2015-01-28 03:01:44 +13:00
1da873ab8f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-27 21:09:31 +13:00
94f79990e4
Kit changes to wizards
2015-01-27 21:09:15 +13:00
290e4d69df
map parser update
2015-01-27 13:59:28 +11:00
19208de075
mroe map parser ^_^
2015-01-26 11:53:48 +11:00
90573903da
added new gametypes for parser
2015-01-26 11:33:47 +11:00
b98950b121
map parser visual changes
2015-01-26 11:31:42 +11:00
f80e640d34
Map Parser voxel update
...
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
10ab390bd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-26 11:20:12 +11:00
40ef3317dd
committing necessary files to merge
2015-01-26 11:20:02 +11:00
76e6b7530f
Meteors now explode everything on contact. Added spellbook for spectators and pregame. Mana cost now obvious when cooling down. Lowered some random item amounts
2015-01-26 09:09:46 +13:00
b4b8b307b0
Rename Wizard Battles to Wizards
2015-01-25 18:50:45 +13:00
c19f10aff9
Reduce kit mystic mana regen to 10%
2015-01-25 18:33:22 +13:00
8262eb9f48
Rebalance explosive rune, fix rank bug and books no longer drop
2015-01-25 18:27:21 +13:00
7682907478
Wizards modifications - Its amazing how things slip past you
2015-01-25 06:18:07 +13:00
38aac5bab0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-24 23:14:54 +13:00
3525243f9d
Numerous fixes to Wizards
2015-01-24 23:14:23 +13:00
58a8a32e93
Added cross-server Announcements and Global messages.
2015-01-24 01:44:22 -08:00
d6e8fdd2ed
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-23 23:33:39 -08:00
39d1a48bc1
Added cross-server instant punishments.
...
[Punish] Banning doesn't kick.
2015-01-23 23:33:24 -08:00
3ff0592d2d
Mild fix on fireball, fix heal given less cooldown and lower heal spell heals
2015-01-24 13:51:18 +13:00
31c1be9dd8
Nerf the spell heal
2015-01-23 23:25:03 +13:00
99c9bfbf33
Left clicking a chest is harmless
2015-01-23 23:18:29 +13:00
da81d131a7
Don't open wizard spell menu if they right clicked a chest
2015-01-23 23:17:45 +13:00
b00deb683e
Red overtime
2015-01-23 22:28:07 +13:00
5b39f1642d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-23 01:17:38 -08:00
34cd48cfb6
Fix for duplicate check.
2015-01-23 01:17:27 -08:00
def2018c8b
Remove center blocks of stone wall wizard spell
2015-01-23 22:15:27 +13:00
92ef0af39d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2015-01-23 22:01:51 +13:00
b92226a771
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-23 00:55:36 -08:00
c5b444ae6e
Wizards push
2015-01-23 21:52:03 +13:00
73866669b8
Added RestartCommand and SuicideCommand
...
ServerMonitor will now cleanup bloated Lobbies starting from the highest number lobby.
Fixed issue with new servers getting cleaned up as excess as soon as they started.
2015-01-22 23:19:40 -08:00
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
8bf64ec55c
Database and code implementation of enemies
2015-01-22 22:17:19 -05:00
882eb46479
Unclaiming land when you run out of energy
2015-01-22 21:32:10 -05:00
2bab4133b0
Fix ugly /gold command
2015-01-22 20:41:05 -05:00
a1f2a3a2a1
Clan Energy
2015-01-22 20:34:44 -05:00
Jonathan Williams
Mini-Chiss
Shaun Bennett
libraryaddict
Chiss