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

2065 Commits

Author SHA1 Message Date
Jonathan Williams
2446e6d64d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-20 21:42:40 -08:00
Jonathan Williams
1f5be77880 Fixed text in Dom shop. 
Cleaned up some code in benefit stuff.
 2014-11-20 21:42:33 -08:00
Chiss
f1ba5947a4 Some more wither updates 2014-11-21 16:32:12 +11:00
Jonathan Williams
6c63552480 Refactored RankBenefitsGiver9000 
Added Thanksgiving benefits (1 treasure key).

ServerMonitor now ignores Testing group.
 2014-11-20 21:24:23 -08:00
Chiss
0d78433bd2 updated mapparser 
buffed withers a little
 2014-11-21 10:36:41 +11:00
Chiss
7a8759dfba updated disguisemanager so it uses player arg 
fixed invisibility bug on disguises for specific players
updated champs skills
made some hard achievements a bit easier
 2014-11-21 09:42:05 +11:00
Jonathan Williams
77b47c9e13 Fixed UI achievement skill stuff. 2014-11-20 08:50:25 -08:00
Chiss
972911fe05 set achievement skills 2014-11-20 18:01:46 +11:00
Jonathan Williams
d1a4080cbd Added GUI support for achievement skills. 2014-11-19 22:47:10 -08:00
Jonathan Williams
ab78b4b89d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-19 22:25:17 -08:00
Jonathan Williams
1a6b80b08e More work on clans.. 
Finished ClansDataAccessLayer
Finished ClansAdmin
Finished ClansDisplay
 2014-11-19 22:24:36 -08:00
Jonathan Williams
828b866fc1 Added functionality to RepositoryBase to return generated keys. 
Prevent invalid UUID from jacking up web call in Enjin listener.
 2014-11-19 22:23:42 -08:00
Chiss
450cc9ada2 Champions achievement update 
Wither update
 2014-11-20 17:21:22 +11:00
Chiss
4961b55986 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-18 16:43:53 +11:00
Chiss
f5022ecf16 Fixed dupe glitch (all games) 
Some champions skill fixes
created GameSpectatorManager to handle spec stuffz
 2014-11-18 16:43:39 +11:00
Shaun Bennett
e99a3f6544 Merge remote-tracking branch 'origin/master' 2014-11-17 18:19:06 -06:00
Shaun Bennett
f071d2e727 Fix for TNT explosion in Bridges 2014-11-17 18:09:58 -06:00
Jonathan Williams
13ba32f2f4 Added command queueing for failed commands in EnjinTranslator. 
Added verification of coin/gem application in Web api.

Added code to support polling last 100 purchases with EnjinTranslator

Added UUId lookup to CoreClientManager and fixed Async to Async calls with DatabaseRunnable.
 2014-11-17 14:06:38 -08:00
Chiss
2384b91b06 game timer > advertisement 2014-11-16 14:45:18 +11:00
Chiss
900c31f479 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-16 14:41:11 +11:00
Chiss
cd890e6c6c disabled spec menu in minestrike - fixes shop bug. 2014-11-16 14:40:50 +11:00
Jonathan Williams
2e58342032 Removed MS from beta. 2014-11-15 19:27:37 -08:00
Jonathan Williams
24b59e5a9d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-15 16:26:39 -08:00
Chiss
4c3610c3ac fixed DMT silence 2014-11-16 10:46:26 +11:00
Jonathan Williams
99ff386ac1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-15 14:32:40 -08:00
Chiss
454deb03db fixed SG crash bug 2014-11-16 09:31:03 +11:00
Jonathan Williams
ad6f41e1c6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-15 03:42:57 -08:00
Chiss
057594205e Only closing CREATIVE Inv for non-ops. 2014-11-15 22:40:56 +11:00
Chiss
ca58f11174 specs should be able to view stats now 2014-11-15 22:32:00 +11:00
Jonathan Williams
81b5317376 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-15 03:31:01 -08:00
Chiss
fb70b76d29 FINGERS CROSSED 2014-11-15 22:29:53 +11:00
Jonathan Williams
857ff29461 Removed buggy player disguises. 
Removed datavalues from wither disguise.
 2014-11-15 03:21:48 -08:00
Jonathan Williams
531b242cce Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-15 03:08:35 -08:00
Shaun Bennett
d16896e493 Merge remote-tracking branch 'origin/master' 2014-11-15 05:04:57 -06:00
Shaun Bennett
1ca23390cc Fix my derp 2014-11-15 05:04:48 -06:00
Jonathan Williams
48c522a86b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-15 03:03:52 -08:00
Chiss
8d6793060c made early levels a little easier to progress through 2014-11-15 21:33:28 +11:00
Jonathan Williams
2af66c99e7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-15 01:17:21 -08:00
Chiss
41b6296788 Wither no longer shoots in pregame lobby 2014-11-15 20:16:18 +11:00
Jonathan Williams
df76f6be10 More work on Clans. 2014-11-15 01:13:14 -08:00
Jonathan Williams
685a2899ca Added custom name to wither disguise. 2014-11-15 01:12:58 -08:00
Chiss
51bc53262d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-15 19:32:08 +11:00
Chiss
ca4eec20ed Wither Assault update 2014-11-15 19:31:56 +11:00
Shaun Bennett
521b1e5f3b Merge remote-tracking branch 'origin/master' 2014-11-13 21:54:15 -06:00
Jonathan Williams
2cf76ae5b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-13 19:15:05 -08:00
Jonathan Williams
4812da2cd9 More work on Clans - Clan repository. 2014-11-13 19:14:56 -08:00
Jonathan Williams
1ee16d284d Updated StaffServer packages to reflect enjin shop. 2014-11-13 19:14:43 -08:00
Chiss
8ab0116a27 initial push of Wither Assault 2014-11-14 14:14:31 +11:00
Jonathan Williams
62fbeeda20 Added Wither disguise. 2014-11-13 19:14:14 -08:00
Shaun Bennett
223bc2d0c0 Remove some debug messages that we no longer need 2014-11-13 19:34:55 -06:00
Shaun Bennett
6038c72e86 Add cleaner page for when there is only 1 team 2014-11-13 19:33:39 -06:00
Shaun Bennett
ea8b8dca15 Disable spectator menu for castle siege and uhc until I work out a better way to show that many players 2014-11-13 19:18:28 -06:00
Shaun Bennett
af31f4cd42 Add Tab handling for MultiCommandBase and "game set" command 2014-11-13 18:22:00 -06:00
Shaun Bennett
48c09aa311 Making spectator gui look better 2014-11-13 18:05:28 -06:00
Shaun Bennett
eb4b451e12 Fixing some spectator gui bugs 2014-11-13 16:41:42 -06:00
Shaun Bennett
8b73b89a17 Merging spectator gui with main branch 2014-11-13 16:03:14 -06:00
Chiss
112f76a29a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-13 18:10:10 +11:00
Chiss
9eaacd20ab fixed slime healing 
fixed sheep quest brute not dropping sheep
updated punish page
 2014-11-13 18:09:54 +11:00
CoderTim
09ca2234c4 Fixed survival games death match bug: https://trello.com/c/jNGSUUGI 2014-11-13 01:49:14 -05:00
CoderTim
7667aa25a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-13 00:26:53 -05:00
Chiss
c5a873ffab Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-13 14:40:26 +11:00
Chiss
f9f7a834c2 geno morf 2014-11-13 14:38:33 +11:00
Jonathan Williams
7cad40044a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
 2014-11-12 19:36:00 -08:00
Jonathan Williams
1372f74921 Refactored some names in MiniPlugin 
Work on clans.
 2014-11-12 19:21:12 -08:00
Jonathan Williams
0193c397fb Added Kit unlocks to staff server 
Added password persistence in db.
 2014-11-12 19:20:41 -08:00
CoderTim
d363637015 Achievement bug fixes 2014-11-12 20:56:57 -05:00
Jonathan Williams
2e848c2ac2 Fixed some of twiggy conflicts. 2014-11-12 05:13:58 -08:00
Jonathan Williams
8d62966abc Created Clans project. 
Converted Fields code complete (not tested).
 2014-11-12 05:13:16 -08:00
Chiss
71a93bead5 Updated punish to be even less confuse. 2014-11-12 09:49:03 +11:00
Chiss
d7141e4943 Added warning note to punish 2014-11-11 20:02:35 +11:00
Chiss
f7ad986503 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-11 19:05:58 +11:00
Chiss
debf8ebcba fixed chat not being unsilenced when someone picks word 2014-11-11 18:52:00 +11:00
Shaun Bennett
c0f2f8a88c Remove useless comment/import 2014-11-11 01:47:03 -06:00
Chiss
c37026e4df SSM Dom changes 2014-11-11 18:36:32 +11:00
Shaun Bennett
23ab9756dc Merge remote-tracking branch 'origin/master' 2014-11-11 01:32:55 -06:00
Jonathan Williams
b08cd54666 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-10 23:31:38 -08:00
Jonathan Williams
827fef535f Some commented out testing code in DisguiseManager 2014-11-10 23:30:41 -08:00
Jonathan Williams
108421164c Added support for stats with spaces in them for GiveStat. 2014-11-10 23:30:16 -08:00
Shaun Bennett
cf25d17c66 Update craftbukkit.jar with command event 2014-11-10 23:53:08 -06:00
Shaun Bennett
5b9b7347c6 Add tab complete processing for commands 2014-11-10 23:49:35 -06:00
Chiss
6c6c51e950 fixed compilation problems 2014-11-11 14:28:35 +11:00
Chiss
91f92dc7e1 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-11 12:25:52 +11:00
Chiss
a1eff92bbb fixed achievement kit for sneaky not being accessible 2014-11-11 12:25:36 +11:00
MrTwiggy
e3c50bfb39 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java
 2014-11-10 18:55:57 -05:00
MrTwiggy
920bdad64c Player report system commit, including functionality for long-form MySQL storage of report logs as well as real-time redis based report sessions. 2014-11-10 18:44:46 -05:00
Chiss
d2301337d2 fixed non-charged block toss not having any velocity. 2014-11-10 19:28:36 +11:00
Chiss
d362fb3b1c fixed punish error 2014-11-10 19:15:56 +11:00
Chiss
0252db5a05 Punish simplification update 2014-11-10 18:40:39 +11:00
Chiss
d6ade5a15b ensured that exp cannot be given multiple times for a game 2014-11-09 14:43:06 +11:00
Chiss
d5515d11b2 fixed kick reason for bans 2014-11-09 14:27:01 +11:00
Chiss
6405253b1c added word wrap on punish text in GUI 
only staff+punishee will now see punishments
 2014-11-09 14:09:30 +11:00
Chiss
3c39e3d93a changed sev2/3 hack punishements 
updated ban kick/login messages
 2014-11-09 13:47:25 +11:00
Chiss
a1f7fc5187 warnings are now friendly :) 
reach hack detection base
 2014-11-09 12:22:55 +11:00
Chiss
b65d2f491e exp gives less for losing 2014-11-09 10:33:50 +11:00
Chiss
2a04ed6eda losing games no longer gives exp 2014-11-09 10:30:26 +11:00
Chiss
ad933400b9 Sheep Quest update 
lowered exp on loss
removed Participation exp
 2014-11-09 10:06:04 +11:00
Jonathan Williams
403165edf4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-08 14:32:48 -08:00
Jonathan Williams
2781bb3000 Removed stacking buffers. 2014-11-08 14:32:37 -08:00
Jonathan Williams
7fb679e7f5 Changed lobbyBalancer to send one player to each lobby that wasn't full. 2014-11-08 14:32:24 -08:00
Chiss
7e26def6a1 centralised SneakyAssassins module cleanup 2014-11-08 18:40:23 +11:00
Chiss
5ce38c3030 removed final from npcManager 2014-11-08 18:37:18 +11:00
Chiss
b6904f2ae1 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 18:36:18 +11:00
Chiss
c0ec9f92fc nulled reference too, just to be safe :D 2014-11-08 18:36:05 +11:00
Chiss
2b0befdc13 fixed listener leak in SneakyAssassins 2014-11-08 18:35:34 +11:00
Jonathan Williams
f03fe663f6 Simplified Lobby balancer code to randomize server selection on best 10 servers. 
Increased rate at which bungee retrieves server information.

Increased rate at with servers sends server information.
 2014-11-07 22:04:51 -08:00
Jonathan Williams
c310ba734b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 16:09:05 -08:00
Chiss
fc2bba7eeb reverted idlemanager stuff for dmt(had already made talking in chat count as action) 2014-11-08 11:08:13 +11:00
Jonathan Williams
0a874d0ee3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 16:04:14 -08:00
Chiss
8c74022996 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 11:04:06 +11:00
Jonathan Williams
48c627db74 UHC tweaks and message changes. 2014-11-07 16:04:06 -08:00
Chiss
601c1912f5 may have fixed sheep teams not working. 2014-11-08 11:03:53 +11:00
CoderTim
80226a20fa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:55:20 -05:00
CoderTim
4c98d833e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:33:46 -05:00
Chiss
e286bec777 added a little msg for people in UHC, informing that it will start soon 2014-11-08 10:30:32 +11:00
CoderTim
5b1a185a5f Fixed Bad Hider achievement 2014-11-07 18:28:28 -05:00
CoderTim
ae35e82e22 Disabled AFK kick in Draw My Thing 2014-11-07 18:28:06 -05:00
CoderTim
96f54c2949 Made DBPool class uninstantiatable 2014-11-07 18:27:20 -05:00
Chiss
75c07588a5 UHC wont start for 2 minutes after creation 2014-11-08 10:22:23 +11:00
Chiss
24725eb22e play a sound when you get punished 2014-11-08 10:15:46 +11:00
Chiss
44fbd9fdd2 updated punishment output. 
punishee is now informed of the reason in chat.
 2014-11-08 10:11:12 +11:00
Chiss
3a3c2002f5 fixed level exp requirements 2014-11-08 09:17:59 +11:00
Chiss
c61ad8907a set minimum MP level for staff 2014-11-08 09:15:27 +11:00
Chiss
5da0c53997 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 08:56:52 +11:00
Chiss
e773d44564 limited max exp so UHC doesnt give you a billion exp. 2014-11-08 08:56:30 +11:00
Jonathan Williams
4ac70281d4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 13:54:22 -08:00
Jonathan Williams
3309c0406b Added ∞ for admin/owners as player level. 
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
 2014-11-07 13:54:11 -08:00
Chiss
bd730b1e5a Fixed OITQ not giving wins. 
Added silence during word selection in DMT
 2014-11-08 08:46:26 +11:00
Chiss
c64e4e3b5f fixed winners/losers for death tag. 2014-11-07 23:35:43 +11:00
Chiss
908a8506a7 fixed broken OITQ kit 2014-11-07 23:21:30 +11:00
Chiss
519e63a1c1 re-unlocked kits for single game ultra chaps. 2014-11-07 23:10:33 +11:00
Chiss
c93862f299 updated player level 
added /givestat command for owners (must use full string; Global.ExpEarned)
 2014-11-07 22:10:41 +11:00
Jonathan Williams
5c6f12db20 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 02:35:48 -08:00
Jonathan Williams
33696d1e28 Fixed null resourcePack problem. 2014-11-07 02:35:38 -08:00
Chiss
9c80103d6e completely disabled gamehost manager (double safe) 2014-11-07 21:32:44 +11:00
Jonathan Williams
2c098e531a Added error catching for arcade configuration. 2014-11-07 02:14:34 -08:00
Jonathan Williams
f0099368d0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 01:27:16 -08:00
Jonathan Williams
264df5af79 Fixed load time issue with ServerConfiguration. 2014-11-07 01:27:07 -08:00
Chiss
c245f84593 increased exp per level in mineplex level achievemnet 2014-11-07 20:10:15 +11:00
Chiss
fadaa59526 added mineplex level 
removed ability to go into negative gems as villager morph
 2014-11-07 19:20:15 +11:00
Chiss
6ded835ba4 MAC will no longer false positive on people standing blocks from block morph. 2014-11-07 14:14:43 +11:00
Chiss
cd4d2c16a8 Fixed fortitude healing too much 2014-11-07 14:07:22 +11:00
Chiss
a67842b504 returned hub to normal 
removed flaming pumpkins from arcade
 2014-11-07 12:54:38 +11:00
Chiss
b7ce12165e game host stuff 2014-11-07 12:14:33 +11:00
Chiss
4c675cca9c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-11-07 11:54:14 +11:00
Chiss
91e0b42de8 Added start of MPS stuff 
Some new gadgets
 2014-11-07 11:52:58 +11:00
Jonathan Williams
f931bd26e6 Updated ServerConfiguration to support resourcepack and Arcade settings. 2014-11-06 00:25:49 -08:00
Jonathan Williams
6f2a6a6ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-05 14:45:54 -08:00
Jonathan Williams
44ccd452a3 Added ServerConfiguration. 
Added support to enable whitelist, alter max players and pvp value.
 2014-11-05 14:44:56 -08:00
Jonathan Williams
4722062a36 Friend: 
Prevent display of staff servers to non-staff.
Prevent display of CUST servers from everyone.
 2014-11-05 14:44:25 -08:00
Jonathan Williams
4254225462 CoinBombs and GemBombs now queue their amounts to prevent excessive database calls. 
Removed excess account row information retrieval on web api when awarding gems/coins.
Added account specific transactional locks in webapi.
 2014-11-05 14:42:11 -08:00