JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,996 Commits 1 Branch 0 Tags 481 MiB
29204de987
Commit Graph

791 Commits

Author SHA1 Message Date
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
Jonathan Williams
2781bb3000 Removed stacking buffers. 2014-11-08 14:32:37 -08: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
CoderTim
4c98d833e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:33:46 -05:00
CoderTim
96f54c2949 Made DBPool class uninstantiatable 2014-11-07 18:27:20 -05: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
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
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
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
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
Jonathan Williams
1a09c14642 Reverted database connection pooling because it caused severe login delays. 2014-11-05 14:39:22 -08:00
Chiss
a66c3486d3 fixed bug in foot particle. 2014-11-05 11:35:52 +11:00
Chiss
b00fb0952a Updated Sheep Quest to be 1.8 comptible. 
Fixed fissure not working on slabs
Fixed a bug in recharge
Added ability for admins to give other people creative (they lose it when the admin quits)
 2014-11-05 11:26:39 +11:00
Chiss
3a6968a60b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-04 19:17:21 +11:00
Chiss
f6df7705b1 - Added 3 kits for DMT 
- Added achievement kit for OITQ/Sneaky Assassins/DMT
- Fixed stats/achievements not working (Keen Eye, I See You, Incompetence, DMT Wins)
- Various improvements/fixes for Champions
- Nerfed trollability of Digger kit in DE
 2014-11-04 19:17:06 +11:00
Shaun Bennett
174b1f43c4 GiveItem Fixes 2014-11-03 18:24:56 -06:00
Shaun Bennett
50ea13910a Change GiveItem command to Dev+ 2014-11-03 10:26:08 -06:00
Jonathan Williams
30a1df1473 Fix for null pointer in particle foot. 2014-11-01 02:38:59 -07:00
Jonathan Williams
d64e8c5162 Added max of 10 connections for db pool. 2014-11-01 02:35:36 -07:00
Jonathan Williams
86fb78e34c minor Unused code cleanup 2014-10-31 23:32:59 -07:00
Jonathan Williams
fa0049d22a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-31 23:01:15 -07:00
Jonathan Williams
f206441999 Fix partial commit. 2014-10-31 23:00:53 -07:00
Jonathan Williams
c85ba72730 Added null check for dragooon. 
Added two treasure keys for halloween give away.
 2014-10-31 23:00:13 -07:00
CoderTim
f3770933b6 Merge branch 'feature/database-pool' 2014-11-01 01:59:07 -04:00
Chiss
0095a03df7 returned bridges to normal 2014-11-01 11:11:35 +11:00
Chiss
83d182db2e Fixed Villager exploit! oops 
Some balance stuff in champs
 2014-11-01 08:38:36 +11:00
Chiss
b5ef46007f updated npc info 2014-10-31 18:17:12 +11:00
Chiss
de08456093 fixed error in block restore 2014-10-31 10:47:18 +11:00
Chiss
aca18bb2e7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-31 10:36:06 +11:00
Chiss
aa45f031ac 3 new achievement Kits 
SSM Balance patch
Champs balance
tons of bug fixes
 2014-10-31 10:35:47 +11:00
CoderTim
cc8912b27e Added NPC info messages to NpcManager 2014-10-30 18:20:21 -04:00
CoderTim
50a457ba51 Database pool tweaks 2014-10-29 19:13:28 -04:00
CoderTim
4fc291ea80 Everything but Mineplexer using database pool 2014-10-29 18:43:21 -04:00
CoderTim
5244f65d8f All connections to db.mineplex.com/Account use database pool 2014-10-29 17:54:40 -04:00
Shaun Bennett
9819b6c10a Merge remote-tracking branch 'origin/master' 2014-10-27 20:25:47 -05:00
Shaun Bennett
054c26dfbc New Coin/Gem Command 2014-10-27 19:59:30 -05:00
Shaun Bennett
01d44cd250 Give Item Command 2014-10-27 19:25:59 -05:00
CoderTim
f0ba562265 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-27 18:11:29 -04:00
CoderTim
9f8b119fb7 Bug fixes 2014-10-27 18:09:23 -04:00
Jonathan Williams
006e20bb13 Prevent more than 5 players from being processed at a time on server connect. 2014-10-27 04:35:05 -07:00
Jonathan Williams
e926fc1f10 Fixed TransferCommand 2014-10-27 04:34:35 -07:00
CoderTim
a1c4b8840f NpcManager no longer uses database connection pool 2014-10-25 16:51:58 -04:00
Chiss
849d5f1471 lowered gem rewards for MS a little 2014-10-25 18:37:18 +11:00
Chiss
bd2e7faf3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-25 13:40:53 +11:00
Chiss
4002528c51 Updated GUI text. 
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
 2014-10-25 13:40:34 +11:00
Shaun Bennett
5cf3e6c3a1 Fix for arcade custom tags 2014-10-24 19:36:22 -05:00
Chiss
25fc3c0645 Achievement Kits (3 games) 
Halloween Pumpkins
Youtube command (allows kits)
 2014-10-24 19:05:57 +11:00
Jonathan Williams
27dc9f7693 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-23 23:58:24 -07:00
Jonathan Williams
d4900c38b1 Halloween server max. 
CustomTagFix fix for invis armor stand on your own head.
 2014-10-23 23:58:13 -07:00
CoderTim
f52a89d2ca NpcManager teleports slimes correctly 2014-10-20 18:19:19 -04:00
CoderTim
db3354176c NpcManager stores test server NPCs under a different server name 2014-10-20 18:08:28 -04:00
Jonathan Williams
8630a1ba4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 23:39:21 -05:00
Jonathan Williams
e3cd6f0e69 Fixed Mem leak in CustomTagFix 
Changed to ServerGameMenu
Fix for overfilling HH servers
Added staff ability to join all servers.
 2014-10-17 23:29:24 -05:00
Chiss
075bc0af1d Added gem rewards for MS achievements 2014-10-17 21:20:04 +11:00
Jonathan Williams
2bbb29c8bb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 02:57:30 -05:00
Chiss
f5efea1e9a Missing files 2014-10-17 18:34:23 +11:00
Jonathan Williams
6d38f4e238 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-17 00:42:01 -05:00
Jonathan Williams
8466b8e2dd Fixed building issues with EnjinTranslator 
MAde mysql repo always record rank change even if windows return rank is different.
Added rough single player replay functionality.
 2014-10-17 00:41:23 -05:00
CoderTim
248438535b Preserve pitch and yaw in NpcManager teleportations 2014-10-16 22:31:09 -04:00
CoderTim
930cdf6c07 Hide NpcManager blank custom names 2014-10-16 22:24:24 -04:00
CoderTim
edb2c4f26a Merge remote-tracking branch 'origin/master' 2014-10-16 22:15:20 -04:00
CoderTim
1fb21d6143 Fixed some NpcManager bugs 2014-10-16 22:13:41 -04:00
Shaun Bennett
ec81e9f511 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
 2014-10-16 17:51:32 -05:00
Shaun Bennett
c855c46940 Add coin command for online players, better way to handle this soon 2014-10-16 17:46:00 -05:00
Chiss
c30171d24f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-16 12:03:09 +11:00
CoderTim
233e6d0b46 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-15 20:44:50 -04:00
CoderTim
535506393f Added ability to customize NPC zombie adulthood, slime size, and villager profession 2014-10-15 20:44:42 -04:00
Shaun Bennett
76dc735b6b Fix bug I was getting with ShopItem 2014-10-15 15:05:31 -05:00
Chiss
82e95f714a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-15 16:57:38 +11:00
Chiss
b83b0e61e6 fixed long lines in achievements 
added night to halloween maps in parser
 2014-10-15 16:57:25 +11:00
Jonathan Williams
a6a4808222 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-15 00:27:01 -05:00
Jonathan Williams
a81bdb4e32 Fixed bug with armor stands showing up for customNameVisible = false; 2014-10-15 00:26:36 -05:00
Chiss
c3fdae135e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-15 16:11:08 +11:00
CoderTim
25b10f0925 Added /npc refresh command to NpcManager 2014-10-15 01:04:52 -04:00
CoderTim
ed64c1972d Update accountStats rows before inserting to prevent id column from skipping on failed inserts 2014-10-15 00:54:23 -04:00
Chiss
d8a8061746 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-15 15:44:41 +11:00
Chiss
eb5af41323 Added halloween reward pet 
minor bug fixes
 2014-10-15 15:44:26 +11:00
CoderTim
2a18888922 Improved NpcManager to work with persistent maps 2014-10-14 22:22:17 -04:00
CoderTim
256df99b7b Added MineStrike to achievement gui 2014-10-13 23:48:38 -04:00
CoderTim
3ba748f2de Merge branch 'feature/currency-log' 2014-10-13 23:13:44 -04:00
Jonathan Williams
1dd51bcac5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-13 21:07:10 -05:00
Chiss
15b6a80613 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-14 13:02:17 +11:00
Chiss
ed9dd6e894 Minor patches 2014-10-14 12:42:53 +11:00
CoderTim
8f90c96019 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-13 20:45:55 -04:00
CoderTim
2016ea09cb Added achievements to games and Achievement enum 2014-10-13 20:38:58 -04:00