47fc6e3b94
Revert "Added pool based repository and converted everything but account and donation repositories to it."
...
This reverts commit 8de8d31eec
2015-01-11 00:41:40 -08:00
0a99a9aa40
Debug flag now depends on file.
2015-01-10 13:19:33 -08:00
fa59ed52b9
Fixed arrow count not updating on shoot cancel
...
Spectators are now permitted to walk on enemy turf
2015-01-11 09:49:46 +13:00
0d27649e85
Fixed minor bug in ServerMonitor.
2015-01-10 11:53:51 -08:00
8de8d31eec
Added pool based repository and converted everything but account and donation repositories to it.
2015-01-10 11:53:25 -08:00
6343a00b53
Instead of removing the shot arrow, cancel the event instead. Fixes kit Shredder being usable during buildtime
2015-01-10 09:08:35 +13:00
9863b701d8
Fixed typos in descriptions of SSM kits Wolf and WitherSkele
2015-01-10 08:54:00 +13:00
7db748bbe1
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-08 13:08:57 +11:00
9daee9733f
Fixed UHC height limit
...
fixed UHC rejoin health bug
2015-01-08 13:08:15 +11:00
836547f4f6
Added a delay to killing 'dead' servers and a verification run after the initial test before killing.
2015-01-06 10:39:18 -06:00
fc45b80e2b
Added rank pulling on bungee login and the ability to put a cap on network player count.
...
Removed log message for converted server group.
2015-01-03 23:37:04 -06:00
8ce097d837
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-04 13:21:35 +11:00
a472404316
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-03 18:04:08 -06:00
7de1c05d1c
Clans run configuration, build configurations, and minor fixes on hub and arcade build configs. (IntelliJ IDEA)
2015-01-03 15:35:47 -05:00
86993ddd55
Fixes again for number player names.
2015-01-03 04:27:28 -06:00
cc06b0ad33
Refactored statmanager to only upload stats on disconnect and only one player per tick.
...
Fixed derp json crap with redis treating a name with only numbers as a number and adding .0 on it.
2015-01-03 01:58:04 -06:00
2a29def670
Bungee rotator only waits 5 minutes before determining a bungee is offline.
2015-01-03 01:53:38 -06:00
aca7fd6849
Removed all create calls
2014-12-31 09:38:41 -05:00
4b937dfade
Refactored inventory repository to use 1 second queue
...
Added 15 second timeout for server connection if db freezes.
2014-12-31 09:38:28 -05:00
5f36c8e424
minor scoreboard changes
...
legend loot bonus
2014-12-30 08:50:37 +11:00
f0e3520343
Prevent inferior ranks to override actual ranks unless its Rank.ALL via Enjin
2014-12-29 08:02:14 -05:00
01bc2ed2ba
Uno mas warning cleanup.
2014-12-29 07:11:21 -05:00
8b5d6ecb6c
Cleanup of warnings.
2014-12-29 07:10:41 -05:00
419f33fcc3
Refactored AntiHack a bit to try and remove CCM
2014-12-29 07:07:05 -05:00
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
a7f77c09fe
Work towards another memory fix.
2014-12-29 06:42:43 -05:00
5a57c5f372
Added Gold saving/retrieval from mysql.
...
Converted DonationManager to MiniDbClientPlugin.
Fixed bug in DonationRepository with gold.
2014-12-29 06:42:20 -05:00
2480361421
LightningOrb now strikes all living entities instead of just players.
2014-12-27 03:25:54 -05:00
d83a63ef57
Changed FriendManager to start supporting expiry friend requests.
2014-12-26 07:36:07 -05:00
8702bafbd0
Changed storage to player names instead of Player object for CustomTagFix
2014-12-26 00:29:57 -05:00
81e423fa4f
Fixed Server transfer stuff. Portal send works!
2014-12-24 14:35:34 -05:00
eb5a7b4276
Added Legend package for support.
...
Refactored Key/Chest commands and added FrostLord package.
Removed password, added whitelist.
2014-12-24 03:41:17 -05:00
6e93d85da8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-24 02:49:37 -05:00
008980d9ca
Slowed Server page update speed.
2014-12-24 01:36:33 -05:00
5446557b89
Merge remote-tracking branch 'origin/master'
2014-12-23 17:48:59 -06:00
043f67f78c
Fix for max players not displaying properly (MPS)
2014-12-23 17:48:38 -06:00
adc5769890
Fix wither not accessible for ranks, fix wither having weird naming in inventories
2014-12-24 04:07:28 +13:00
d83b586a3a
Merge remote-tracking branch 'origin/master'
2014-12-23 08:08:00 -06:00
cff63ca3e3
Phinary needs some sleep!
2014-12-23 08:07:46 -06:00
a1dd1b8753
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 08:08:48 -05:00
5dcda626e7
Fixed port stuff for MPS
2014-12-23 08:08:41 -05:00
1a3920d04a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 23:45:11 +11:00
35bcf28c83
champions builds will now load in MPS, even if the current game isnt champs.
2014-12-23 23:44:59 +11:00
9c1e3aa7aa
Ignore full or dead servers
2014-12-23 06:26:51 -06:00
d40b154902
Merge remote-tracking branch 'origin/master'
2014-12-23 06:20:43 -06:00
c40a5a8eac
Another bugfix
2014-12-23 06:20:36 -06:00
78977788a1
fixed bug
2014-12-23 23:18:29 +11:00
f4c5922b05
added messages for when server is expired
2014-12-23 23:17:21 +11:00
78d94320a8
fixed reciptient of message
2014-12-23 22:55:07 +11:00
ea6214b2ad
Merge remote-tracking branch 'origin/master'
2014-12-23 05:49:08 -06:00
582ed34d21
Fix for staff hosted
2014-12-23 05:48:45 -06:00
07cca7a1d4
Fixed NPE in GameHostManager
...
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
4bfd34034b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 22:19:50 +11:00
8c2d879036
added ownership of legend particle for legends.
2014-12-23 22:17:39 +11:00
50993d19f3
Added Legend for Enjin
2014-12-23 06:07:14 -05:00
d2e078f890
Fixed ranks for MPS
2014-12-23 06:04:42 -05:00
fb841c3831
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
2014-12-23 05:57:45 -05:00
bb8b1d60f9
30 seconds recharge on ability to host locally.
2014-12-23 05:56:17 -05:00
5f509ca488
Rank fixes, visual fixes, lets hope things work!
2014-12-23 04:55:00 -06:00
d8311d860e
Ignore private servers
2014-12-23 04:21:37 -06:00
21d255fcd1
Merge remote-tracking branch 'origin/master'
2014-12-23 04:15:55 -06:00
c41b5b0cfb
private server gui, i think?
2014-12-23 04:15:33 -06:00
6d2bd84b5b
disabled always joinable motd for minestrike
2014-12-23 20:39:49 +11:00
7ef2edd498
Removed extra enjin message.
...
Added retrieval of servergroups to identify if server is a player server or not.
2014-12-23 04:19:24 -05:00
9a767af018
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 03:44:05 -05:00
f00854ee4c
Removed bad code thats bad from the bad birdy.
...
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.
Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
521b61c624
disabled free evolutions
2014-12-23 19:42:13 +11:00
6b5b072ae8
missing file
2014-12-23 19:36:23 +11:00
7496f64d58
benefit
2014-12-23 19:36:10 +11:00
a15256da88
update
2014-12-23 19:04:10 +11:00
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
07d82b8206
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 18:39:22 +11:00
39745913ac
re-enabled roggue
2014-12-23 18:39:05 +11:00
2a585936b7
Maybe I should test before I commit!
2014-12-23 00:37:29 -06:00
2848ec2751
Use the correct data value this time!
2014-12-23 00:33:47 -06:00
48fdfbb8f0
Hub changes for private servers
2014-12-23 00:30:15 -06:00
eb0f23318f
Fix my fix for scoreboard - mine broke when new players joined
2014-12-23 00:06:30 -06:00
4b4ebd0e36
Change admin item to sparkling melon
2014-12-23 00:06:04 -06:00
8f9794a5f7
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-12-22 23:56:18 -06:00
706b3e25ef
Fix broken player count when changing max players
2014-12-22 23:54:51 -06:00
64d37d1886
minor snd changes
2014-12-23 16:50:31 +11:00
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
0e85b7e6cc
Added HostName to server groups.
...
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
1957db25d9
Add player head button
2014-12-22 23:20:20 -06:00
befc2cff7c
messing with jedis subpub
2014-12-22 22:49:28 -06:00
e8953b0c96
fixed merge errors
2014-12-23 15:14:03 +11:00
f961fd0233
Merge remote-tracking branch 'remotes/origin/searchanddestroy'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-12-23 15:09:58 +11:00
0659f497c0
frost lord update
2014-12-23 15:00:32 +11:00
19a7e6d666
time update
2014-12-23 13:01:44 +11:00
8ed7f34ab6
Sorted game pages
2014-12-22 19:20:08 -06:00
4797b251b1
YAY Champions enable/disable works.
2014-12-23 11:39:03 +11:00
825b25e8d1
fixed my bug in miniplugin
2014-12-23 11:29:48 +11:00
71cf8e8fd2
undid champs stuff :(
2014-12-23 11:22:41 +11:00
ec9401506c
Game servers can now run champions/normal on the fly.
2014-12-23 11:18:48 +11:00
a197724de8
fixed le bugs.
2014-12-23 10:48:15 +11:00
0f5c33fe52
derp derp chissderp
2014-12-22 17:41:12 -06:00
b51367f33b
Add missing jooq classes
2014-12-22 17:40:04 -06:00
31b040c654
Merge remote-tracking branch 'origin/master'
2014-12-22 17:37:10 -06:00
1396c3395a
Add kill button, rename ban to remove, add some messages for actions, add remove admin
2014-12-22 17:37:02 -06:00
224d1bbf63
blizzard particle redo
...
hub text
2014-12-23 10:36:48 +11:00
9a9936bc8c
Allow animated motd to be enabled or disabled through database
2014-12-22 16:39:34 -06:00
3efc80ec58
Update jooq database classes
2014-12-22 16:11:59 -06:00
b83a81ec7e
Fixed little conflict issue.
2014-12-22 09:25:02 -05:00
9b3350c8c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-22 09:22:50 -05:00
d920439ec5
Clans update. Laying groundwork for energy
2014-12-22 09:22:10 -05:00
fa0a9ac859
fixed exploit on skylands
2014-12-22 21:08:44 +11:00
ec8e1f0546
more MPS stuff
...
fixed bridges exploit
2014-12-22 16:31:13 +11:00
2472ca95ec
MPS updates
2014-12-22 13:19:45 +11:00
4a50e3ae62
Merge branch 'chissbrokethis'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:57:39 +11:00
98b614848d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:54:31 +11:00
0e7dec919d
minor updates
2014-12-22 10:51:19 +11:00
71f7b4c963
legend join messages
2014-12-22 10:40:06 +11:00
1a56f074b3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-22 10:22:13 +11:00
eba54c6b8a
Removed hub snake parkour
2014-12-22 10:21:58 +11:00
9321abdaf5
Merge branch 'searchanddestroy' of ssh://184.154.0.242:7999/min/mineplex into searchanddestroy
2014-12-19 13:59:31 +11:00
184c6cb4ba
added func to change attackreason for combatmanager
2014-12-19 13:59:18 +11:00
52cc0862d7
Memory leak fix for CUSTOM TAG
2014-12-18 18:29:33 -05:00
93314711e7
Modified snd
2014-12-18 17:56:21 +13:00
4c4ba34d39
Merge pull request #5 from feature/chatslow to master
...
* commit '9ef0ea629c57b148d815b93a455f9817ce512960':
Added changes from master to Chat
Chat Slow Command
2014-12-17 20:08:32 -06:00
9ef0ea629c
Added changes from master to Chat
2014-12-17 20:07:39 -06:00
899add5fcd
Merging changes from master
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
2014-12-17 20:07:11 -06:00
437c1aeabe
MPS rank todo
2014-12-18 13:06:57 +11:00
60f567a3fb
fixed some errors ;o
2014-12-18 12:47:00 +11:00
679f7909b0
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
2014-12-18 12:45:56 +11:00
56d14b7bc0
Particle stuff
2014-12-18 12:45:45 +11:00
604243dfa3
UI improvements - icon changes, whitelist toggle, notify messages
2014-12-17 19:42:11 -06:00
2677d2e557
Fancy icons for 1.8!
2014-12-17 19:15:31 -06:00
a63c48e338
Refactoring private server menu
2014-12-17 18:45:15 -06:00
d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -06:00
1260e875fd
Add clans to intellij. Update button
2014-12-17 18:38:35 -06:00
6e42894d5c
Refactor button again
2014-12-17 18:33:24 -06:00
12973aba7d
Merge branch 'master' into feature/private-servers
2014-12-17 16:47:19 +11:00
e1db8d6a5d
Why was I missing a entitytype import..
2014-12-17 18:37:58 +13:00
26d92f0381
Add missing class
2014-12-17 18:33:43 +13:00
0e7adab3eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-17 18:32:50 +13:00
17ac36d9ae
Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub
2014-12-17 18:31:51 +13:00
6eb3efa0b6
More changes
2014-12-16 20:37:14 -06:00
62a621270e
More work on private server gui. Still need to do a bunch of refactoring
2014-12-16 13:43:01 -06:00
83218c9a73
Pushing unfinished code for laptop
2014-12-16 11:42:06 -06:00
5b1f4f16fb
Modify giveGems for new give gems
2014-12-16 21:58:17 +13:00
a433ad764d
Wither Morph
...
Legend Particle
2014-12-16 16:18:09 +11:00
c43ee95c55
Added 1.8 hooks for disguise setName and getName
...
Refactored method names in some disguise classes.
2014-12-15 21:46:14 -05:00
0cb5939794
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-15 21:30:20 -05:00
6941c1c827
Added a few more items for BuildingShop in Clans.
2014-12-15 21:29:50 -05:00
1907014db4
disguise wither update
2014-12-16 13:28:59 +11:00
7e6b6bd1b2
Add evolve effect
2014-12-16 15:23:31 +13:00
6d3a1116b9
Changes to SnD
2014-12-16 15:14:10 +13:00
913f827ced
Changes to SnD
2014-12-16 15:14:09 +13:00
da6b4b6a79
Current work for SnD
2014-12-16 15:14:09 +13:00
0026127647
More work done on SnD
2014-12-16 15:14:08 +13:00
f5d9d8dcf0
Modify scoreboard to use teams to support duplicate lines and up to 32 in length
2014-12-16 15:14:08 +13:00
715862b365
Commit current changes
2014-12-16 15:14:07 +13:00
6d7a71d043
Modifications for SnD test
2014-12-16 15:14:07 +13:00
2e7d101850
added material/data for gametypes
2014-12-16 12:26:37 +11:00
75cf80652c
Remove customnametrue from horse mount
2014-12-16 01:36:42 +13:00
ee363f55a6
re-enabled gems for CC
2014-12-15 15:50:25 +11:00
d7eb01e8f0
fixed CC Bug :D
2014-12-15 15:49:52 +11:00
e02bcd8b84
Revert the revert of the revert.
2014-12-14 22:58:49 -05:00
d1be64d7e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
2014-12-15 14:56:09 +11:00
95081a8ab7
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
2014-12-15 14:33:38 +11:00
230c6ede13
Disabled gem reward in ChristmasChaos
2014-12-14 22:14:41 -05:00
19dfafe9ed
disabled gems
2014-12-15 13:58:36 +11:00
909c0d9be7
christmas no longer rewards gems
2014-12-15 13:56:48 +11:00
4482e46250
Changed int to atomic for concurrency
2014-12-14 21:53:55 -05:00
eefa4de838
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-14 20:50:35 -05:00
2a58b822a0
Safeguard on connecting vlaues.
2014-12-14 20:50:19 -05:00
d0f8a6a063
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-15 12:26:25 +11:00
9136165d4f
fixed christmas elf name
...
pet names now have limited range
2014-12-15 12:24:40 +11:00
0111db5610
Added safe check for server monitor so it doesn't go off the rails during a network reboot.
2014-12-14 05:54:49 -05:00
9fb2231d76
Added connecting clients as a factor for status snapshot.
...
Added online check for DonationManager rewarding local info.
2014-12-14 02:32:52 -05:00
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
718e02047e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-13 20:22:48 -05:00
28dc4059a4
Don't reset Lobby index else lower lobby counts can crash due to spam connects.
2014-12-13 20:22:37 -05:00
4e0c91c26d
Adjusted limit on CC game.
2014-12-13 20:22:01 -05:00
80c17c789c
Updated BungeeCord to newest custom version.
2014-12-13 20:21:34 -05:00
0198120c70
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-13 12:39:20 +11:00
78a34b1517
hopefully fixed a bug where pumpking king despawned.
...
removed 11 disc from loot
2014-12-13 11:55:12 +11:00
2f98d95737
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-12 06:47:58 -05:00
fb8b00200c
deep snow no longer slowz
2014-12-12 21:57:43 +11:00
5d1a8af347
fixed arctic armor killing players in hub
2014-12-12 21:53:39 +11:00
514445557b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-12 05:32:13 -05:00
dfd17b1793
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-12 21:29:46 +11:00
3f24325c3c
removed +50% player limit for CC
2014-12-12 21:23:01 +11:00
52fad77297
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-12 05:21:45 -05:00
771c7cba0a
Changed playercount back to current +1
2014-12-12 05:21:23 -05:00
e19c76575b
Merge pull request #7 from feature/animated-motd to master
...
* commit '56bc8dc2325d00cbd95247bcc1d270ba0ed703a1':
Trying to do some hacky things!
2014-12-12 04:19:38 -06:00
56bc8dc232
Trying to do some hacky things!
2014-12-12 04:18:47 -06:00
14c6c1ca4b
Merge pull request #6 from feature/animated-motd to master
...
* commit 'b65ca5f7dd8e07d2d65e59d08a7d907d29b172d6':
Update bungee cord, comment out debug stuff
Fix icon animation + some more tweaks
Some adjustments
Motd stuff for xmas update
pushing this for my laptop. not final code!
2014-12-12 02:54:30 -06:00
b65ca5f7dd
Update bungee cord, comment out debug stuff
2014-12-12 02:53:56 -06:00
4fd6ed80c4
final xmas Updates
...
xmas hub
2014-12-12 19:44:04 +11:00
7b42bd661f
Fix icon animation + some more tweaks
2014-12-12 01:13:02 -06:00
ac02201262
Some adjustments
2014-12-12 00:48:08 -06:00
30a7eea628
Motd stuff for xmas update
2014-12-12 00:28:29 -06:00
9a16616e6c
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
2014-12-12 12:40:23 +13:00
adafc95d3f
boss weaker
2014-12-12 10:26:32 +11:00
2be4d7d6d2
XMAS UPDATE
2014-12-12 10:03:25 +11:00
93dc3c9090
pushing this for my laptop. not final code!
2014-12-11 09:17:19 -06:00
3af8a90d3b
near final xmas push :D
2014-12-11 15:23:01 +11:00
3a8ab0afb0
Uncomment SleighHorse
2014-12-11 15:24:10 +13:00
6b1fa91565
Xmas Updates
2014-12-11 12:42:06 +11:00
Jonathan Williams
libraryaddict
Chiss
Shaun Bennett