JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,844 Commits 1 Branch 0 Tags 481 MiB
18843c2cc6
Commit Graph

1453 Commits

Author SHA1 Message Date
Jeremiah Bishop
dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
libraryaddict
b0c026e67c Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn 2015-06-16 14:01:52 +12:00
Jonathan Williams
47099a0b20 Changed default redis ip to new us redis. 
Changed previous server to gold text when sending to new server.
 2015-06-12 15:45:54 -05:00
Jonathan Williams
c6352445cf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-08 23:18:06 -05:00
libraryaddict
8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +12:00
libraryaddict
6c9963e1b3 CommandCenter: Cancel command event straight after verifying that its been registered 2015-05-30 05:44:49 +12:00
Shaun Bennett
7d43b146b7 [Core] Display Games Played instead of Losses for a bunch of the arcade games where losses will be greater than wins 2015-05-28 19:05:45 -05:00
Jonathan Williams
2c5471cb34 Added ability to see which server you were sent from. 2015-05-28 09:33:49 -05:00
libraryaddict
d84bd4ffe4 Messaging: Now with censors! 2015-05-28 10:13:31 +12:00
Jonathan Williams
96b1df4ee0 Fixed global player count. 
Fixed tasks.
 2015-05-22 14:33:25 -07:00
Jonathan Williams
f0c7f2fe76 Merge branch 'MSSQL_Conversion' 
Conflicts:
	Website/LOCWebsite.suo
 2015-05-17 23:11:50 -07:00
Shaun Bennett
0d2157b4f3 [Core] Fix /stats lava bucket bug 2015-05-13 23:23:43 -05:00
Jonathan Williams
a6cf1309ff Fix for ranks not applying. 2015-05-13 14:33:31 -07:00
Jonathan Williams
1c6a12528c Added ability for LT to modify Admin ranks. 
Added Twithc rank to the updateRank list.

Fixed server sorting issues with UHC Generating servers.
 2015-05-13 00:58:45 -07:00
Shaun Bennett
aa5898e1db Merge remote-tracking branch 'origin/master' 2015-05-12 18:43:48 -05:00
Shaun Bennett
f9269b534f [Core] Add look AI to NPC's 2015-05-12 18:43:26 -05:00
Shaun Bennett
d703070810 [Core] Shrink stat page 2015-05-12 17:20:58 -05:00
Shaun Bennett
53555a42cd [Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats 2015-05-12 17:14:50 -05:00
Mini-Chiss
e1dd3a318e UHC!!!!! 2015-05-12 15:52:19 -05:00
Shaun Bennett
90fc4656fa [Core] Attempt at mitigating spam bots without hurting normal players 2015-05-12 08:09:13 -05:00
Shaun Bennett
5d13b6a144 [Core] Disable writing on signs for muted players 2015-05-12 07:11:35 -05:00
Shaun Bennett
87f495e376 [Core] Filter text on placed signs with Chat Module 2015-05-12 07:02:34 -05:00
Shaun Bennett
06a0f3d0d5 Merge remote-tracking branch 'origin/master' 2015-05-12 00:37:40 -05:00
Shaun Bennett
9d959ee7a3 Fix/Enable Look at me Button 2015-05-11 20:46:37 -05:00
Mini-Chiss
643ed2c047 Fixed most enchants not working 
added commands to event
minor update to snowfight to make it more fun
 2015-05-11 19:55:26 -05:00
Mini-Chiss
8d585ce807 admins can giveitem 2015-05-11 17:59:13 -05:00
Mini-Chiss
55b6d29468 Just shufflin some location 2015-05-11 17:57:21 -05:00
Mini-Chiss
123af16bd2 UHC map gen 2015-05-11 13:25:05 -05:00
Jonathan Williams
b1a46d0f0d Converted TaskManager 2015-05-11 01:21:27 -07:00
Mini-Chiss
6e2b437e55 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-09 12:28:16 -05:00
Mini-Chiss
822718095d cannot PM from spawn 
first push of cards game
 2015-05-09 12:23:07 -05:00
libraryaddict
29c4a033a7 Achievement: Fix wizards 10 win to 50 wins, change wizards to blaze rod, change stats layout 2015-05-08 18:56:00 +12:00
libraryaddict
5ec04263d4 Map stuff: First commit (or second?) 2015-05-08 07:31:03 +12:00
Jonathan Williams
e999f943b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-05-06 20:20:07 -07:00
Jonathan Williams
d3e5dd9c8a Fixed so name searching only returns the last account logged in with that name. 2015-05-06 20:19:58 -07:00
libraryaddict
3e02806b75 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-07 02:57:20 +12:00
libraryaddict
531fe11916 Maps: Rename Map.class to BlockMap.class 2015-05-07 02:57:12 +12:00
Mini-Chiss
40d56c3500 Converted all code to updated UtilParticle methods 
/suicide
 2015-05-03 16:37:00 -05:00
Mini-Chiss
ab6937a525 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 18:05:55 -05:00
libraryaddict
f85d27db1a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 19:25:11 +12:00
libraryaddict
cc65830f9b ResourcePack: Ignore ServerGroup's resource pack and set MineStrike to use new ResourcePack code 2015-05-01 19:24:20 +12:00
Mini-Chiss
1b8ab13160 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-05-01 00:51:52 -05:00
Mini-Chiss
ba5802cc14 wizards kit availability 2015-05-01 00:47:51 -05:00
Jonathan Williams
fa4466b6a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-05-01 00:13:39 -05:00
Jonathan Williams
d161d62773 Added chat filtering to private messages. 2015-04-30 23:56:08 -05:00
libraryaddict
82cd4208bd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
 2015-05-01 14:22:53 +12:00
Mini-Chiss
ed1c7e2336 Master Builders initial push (dont worry jon it doesnt effect anything for the update!) 2015-04-30 18:20:35 -05:00
libraryaddict
5d36ddce3a Arcade: Close only non-player inventories at 5 seconds 2015-04-30 21:17:08 +12:00
libraryaddict
33bbe96964 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards 2015-04-30 01:33:43 +12:00
libraryaddict
c2b7001fcc Wizards: Current progress 2015-04-30 01:32:22 +12:00
Jonathan Williams
ae1480fb1e Little bit of spacing fixed. 2015-04-21 23:36:33 -05:00
libraryaddict
b29893ff60 Merge branch 'ResourcePack' into Wizards 2015-04-22 03:46:25 +12:00
libraryaddict
9f8fe3bf78 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-04-22 03:45:59 +12:00
libraryaddict
aeff6bf4b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 2015-04-22 00:25:56 +12:00
Cheese
f4a91455f6 Champions Balance 2015-04-19 12:22:51 +10:00
Cheese
91a70d6a04 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-16 21:06:19 +10:00
Cheese
b352b28fdc fixed MAC still being disabled 2015-04-16 21:05:56 +10:00
Jonathan Williams
99436b4a42 Added Tab event back :D 2015-04-14 02:01:04 -05:00
Jonathan Williams
c454973398 Changed login deets for new new db cluster. 2015-04-14 01:59:29 -05:00
Jonathan Williams
3d6dce24ff Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-14 01:32:11 -05:00
Jonathan Williams
e3a328c70d Revert "Work on FriendRepository, still not enabled yet." 
This reverts commit 405d0fec18.

Re-enabled friends.
 2015-04-14 01:32:03 -05:00
libraryaddict
c36c800bb5 AchievementManager: Add SnrMod as a min MP level of 15 2015-04-13 14:05:50 +12:00
libraryaddict
afa372dca7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java
 2015-04-11 12:20:29 +12:00
Jonathan Williams
49431da509 Fix for pulling account UUID with multiple. 2015-04-10 10:53:11 -05:00
Cheese
18ba446764 re-enabled MAC 2015-04-07 08:30:32 +10:00
Cheese
db1a3afa19 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-04 16:02:24 +11:00
Cheese
dc84621b6c blizzard snowballs expire 2015-04-04 16:01:48 +11:00
libraryaddict
9518d9f438 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-04-04 17:33:51 +13:00
libraryaddict
c1c4e8b417 Disguises: Fixed DisguisePlayer not using a random UUID to prevent conflicts, fixed non-player living entities not being disguisable 2015-04-04 17:33:33 +13:00
Cheese
c79432c8b9 Fixed projectile hitboxes and specific values 2015-04-04 10:54:03 +11:00
Cheese
ae298644e2 removed random egg color, looked ugly 2015-04-03 22:02:22 +11:00
Cheese
3cadbf3a34 fixed color in egg 2015-04-03 22:00:54 +11:00
Cheese
f87511331e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-03 21:47:57 +11:00
Cheese
ff0883e7d7 fixed easter egg duration 
parser list improvement
 2015-04-03 21:47:43 +11:00
Jonathan Williams
726c03af58 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-03 03:00:21 -07:00
Cheese
54948cc61e disabled rabbit buying 2015-04-03 20:59:56 +11:00
Jonathan Williams
158cc0909b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-03 02:37:46 -07:00
Cheese
23df6daab0 Added Easter Morph 
Added Eggs Baskets in games
Added double gem for 1.8
 2015-04-03 20:31:23 +11:00
Jonathan Williams
c4de261b69 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-03 02:21:11 -07:00
libraryaddict
66c83397e5 DisguiseManager: Add DisguiseRabbit 2015-04-03 20:52:09 +13:00
Jonathan Williams
120420d35f Really fixed disguise memory leak this time. 2015-04-02 23:37:43 -07:00
Jonathan Williams
fb4be35dfe Let admins apply youtube rank. 
Limit Lobby count to 250.
 2015-04-02 23:36:54 -07:00
Jonathan Williams
437c70e548 Fixed issue with double run() call in loadClientByName. 2015-04-02 23:36:16 -07:00
Cheese
d4e8c0c9a6 Added Respawn middle screen text 
Added Champs capture point mid screen text
Fixed hitbox mults for projectiles
Fixed inconsistent arrow damage
Lots of Champions balance
 2015-04-03 15:28:10 +11:00
Jonathan Williams
24e65e7384 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-01 01:29:05 -07:00
Cheese
3355d2b457 disabled aprilfools cow for team games 2015-04-01 19:15:11 +11:00
Jonathan Williams
8d9d298f0f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-04-01 00:04:44 -07:00
Cheese
987bf266ee fixed bug in moo 2015-04-01 18:02:56 +11:00
Cheese
da9e7892f0 fixed aprilfools bugs 
mamapig debug :(
 2015-04-01 18:01:09 +11:00
Jonathan Williams
38798d3baf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-31 23:47:27 -07:00
Jonathan Williams
6037da6e0f Improved fix for coinQueue memory leak. 2015-03-31 23:47:08 -07:00
Jonathan Williams
405d0fec18 Work on FriendRepository, still not enabled yet. 2015-03-31 23:46:43 -07:00
Cheese
31ddeaac50 a little more moo 2015-04-01 17:28:05 +11:00
Jonathan Williams
10c7d06a88 Memory leak fixes for DisguiseManager and DonationManager. 2015-03-31 23:16:15 -07:00
Cheese
59fce1cd88 adding some mmoooo text 
changed pig kit for baconbrawl
 2015-04-01 17:15:56 +11:00
Cheese
ed35d2a992 April Fools update 2015-04-01 16:56:13 +11:00
Shaun Bennett
50c38dc467 April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA 2015-03-31 17:22:50 -04:00
libraryaddict
b84756ef7a Revert wizard commits 2015-03-27 22:13:50 +13:00
libraryaddict
a27e6fba5c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-27 06:00:14 +13:00
Cheese
e3eda38c2c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-26 10:10:11 +11:00
Cheese
6ab03e95ec more timings for visman 2015-03-26 10:08:41 +11:00
Jonathan Williams
f4061854cd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-25 15:11:17 -07:00
Jonathan Williams
6472194d44 Optimized queries to retrieve and update player information by removing inner join calls on the account. 
Added account id retrieval on login.
Added account id caching in redis.
 2015-03-25 15:10:59 -07:00
Jonathan Williams
589d4b1aae CoreClientManager accessible to public in MiniDbClientPlugin now. 2015-03-25 15:03:08 -07:00
libraryaddict
d3e37d4578 CustomExplosion & explosion/Explosion.java: Add option to use falling block explosions on CustomExplosion by option in Explosion to only spawn falling blocks, not remove blocks so that CustomExplosion can handle that 2015-03-25 20:32:03 +13:00
Cheese
80d350ff85 fixed timedata not storing title 2015-03-23 17:22:11 +11:00
Cheese
4bcdb561be one more timing 2015-03-23 16:40:59 +11:00
Cheese
5fded981d9 Timings for Visibility 2015-03-23 16:38:17 +11:00
Jonathan Williams
4b81f6cd8b Fixed Memory leak with lastState in VisibilityData 2015-03-20 09:05:25 -07:00
Cheese
f54ed0ece2 visibility fix 2015-03-20 23:20:56 +11:00
libraryaddict
1f0e204eb3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
 2015-03-18 00:04:41 +13:00
libraryaddict
52f0941fb9 Add resourcepack options 2015-03-17 23:59:24 +13:00
libraryaddict
ec30269a14 Add new loot classes to manage loot 2015-03-17 18:08:47 +13:00
libraryaddict
921deb5270 Update disguises for 1.8, add sleeping ability to player disguises 2015-03-17 17:48:29 +13:00
libraryaddict
65a9073c69 Add border packet and resource pack status packet. Add ability to listen to incoming packet Use Entity 2015-03-17 17:42:16 +13:00
Cheese
73c66fa93f Merge branch 'SpecRemoveCreative' 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
 2015-03-17 14:57:17 +11:00
Cheese
44e887ec61 fixed give command to properly assign item data 2015-03-17 12:06:41 +11:00
Jonathan Williams
2dade32499 Added support for creating Event servers. 2015-03-15 20:50:54 -07:00
Cheese
4581f49948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-16 13:39:54 +11:00
Cheese
420c4e7229 More work on Event game 2015-03-16 13:39:33 +11:00
Jonathan Williams
4b878c5f27 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-15 04:48:01 -07:00
Jonathan Williams
fcbac70deb Tweaked DB Pool settings, increased connections to 4. 
Disabled Friend and Leaderboard for now.
 2015-03-15 04:47:53 -07:00
libraryaddict
db7def2980 Add relative teleports to /teleport command 2015-03-15 12:42:29 +13:00
libraryaddict
20a51ee7fc Change Blood to unstackable items 2015-03-15 12:30:42 +13:00
Ty Sayers
7811279b26 Convert friend system over to redis-based PlayerStatus data tracking from old SQL storage. 2015-03-14 17:41:16 -04:00
Jonathan Williams
d38a28981b Fixed NPE when type /friend with a space after it. 2015-03-14 06:20:33 -07:00
Jonathan Williams
b6a8b4cee3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-13 22:45:48 -07:00
Ty Sayers
af898e3306 Convert PlayerStatus trackers, Bungee MOTD, and Bungee Server status' from MySQL storage to redis-based system using DataRepository's. 
Re-organize structure of ServerData packaging.
 2015-03-14 01:03:22 -04:00
Jonathan Williams
a93a14c3c1 Changed DefaultTransactionIsolation so entire tables aren't locked every query. 
Decreased DBPool down to 3 connections per server.
 2015-03-13 20:16:37 -07:00
Jonathan Williams
cb93769e03 Converted Bungee to redis. 
Increased DBPool maximum connections to 5.
 2015-03-13 17:53:36 -07:00
Jonathan Williams
838df3f57a Added UUID lookup for saveRank call. 2015-03-13 17:52:25 -07:00
Jonathan Williams
28f73704e5 Improved party lookup for server transfers. 
Always transfer party if leader transfers servers.
 2015-03-13 00:10:29 -07:00
Cheese
c5d48a82a3 Fixed invisibility bug 2015-03-13 11:34:45 +11:00
Jonathan Williams
b1ffe4d07b Re-enabled target server check. 2015-03-12 15:32:22 -07:00
Ty Sayers
f812243185 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-03-12 18:20:08 -04:00
Ty Sayers
33ff7f8e50 Convert leaderboard stat events to insert into the repository using asynchronous task calls. 2015-03-12 18:19:58 -04:00
Jonathan Williams
6394b588ab Re-enabled cross-server functionality. 
RedisPartyHandler execution is now run on Bukkit main thread.
 2015-03-12 04:10:15 -07:00
Cheese
3ceb0ff678 Converted spec away from CREATIVE 2015-03-12 15:31:40 +11:00
Jonathan Williams
23de2f735d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-11 18:31:29 -07:00
Jonathan Williams
bf87cfd0cd Merge remote-tracking branch 'remotes/origin/sql_pooling' 2015-03-11 18:30:52 -07:00
Jonathan Williams
626bfc35fc Revert "Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections."" 
This reverts commit 215ec7b00d.

Enabled multi-queries on db pool.
Cleaned up some code using new pooling getConnection inappropriately
 2015-03-11 18:05:13 -07:00
libraryaddict
9cf0e4d1e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-11 13:17:16 +13:00
libraryaddict
f47447134e Cleanup hologram class, remove witherskull option for 1.8 and fix duplicate nametags and non-invisibility on armorstands 2015-03-11 13:16:00 +13:00
Cheese
16a8fbe088 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-09 22:15:38 +11:00
Cheese
3a0e597276 more event server stuff 2015-03-09 22:15:24 +11:00
Jonathan Williams
27c17eccfb Disabled redis pub commands. 
Added getServerStatusesByPrefix to redis.
Increased timeout for servers.

Turned on DoubleGemWeekend
 2015-03-08 13:47:49 -07:00
Jonathan Williams
8cc60e1b65 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-07 21:49:37 -08:00
Jonathan Williams
14da350b16 Removed unnecessary Windows DB call for Pet Factory. 2015-03-07 21:47:48 -08:00
Ty Sayers
4237cd082c Add support for master-slave replication in redis to balance load of read and writes. Redis based repositories now read/write to specified connection pools (master or slave). 2015-03-07 23:19:35 -05:00
Ty Sayers
215ec7b00d Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections." 
This reverts commit adfe5fb74e.
 2015-03-07 19:38:06 -05:00
Ty Sayers
adfe5fb74e Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections. 2015-03-07 19:36:54 -05:00
Cheese
e0ba667613 old chests drop a little more frequently 2015-03-07 11:53:18 +11:00
Cheese
480a5225f3 increased coin loot from rare chest drops 2015-03-07 11:49:01 +11:00
Jonathan Williams
90dbd64b17 Added closes to connections in RepositoryBase that use DataSource. 2015-03-06 04:12:46 -08:00
Jonathan Williams
c15c6e2dd8 Removed threading for ServerCommandManager 
Removed target server check (some commands are broadcasted)

Disabled Message/Party crossserver listeners.
 2015-03-06 04:12:11 -08:00
Jonathan Williams
2d7f65588c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-06 01:36:38 -08:00
Jonathan Williams
09ecb994f6 Pooled Friend/Ignore/Preferences/Poll/Elo repositories. 
Removed ArcadeRepository as its unused.

Removed target server check for RedisCommand because it breaks other commands.
 2015-03-06 01:36:25 -08:00
Cheese
e62d9774a9 Initial Event Game push 2015-03-06 19:11:26 +11:00
Jonathan Williams
5c738a2e3c Added two-strike system to NCP hooks. 2015-03-05 16:46:50 -08:00
Jonathan Williams
3e27675d96 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-02 12:50:28 -08:00
Jonathan Williams
5e78b43860 Added StaffOnly code to ServerConfiguration 2015-03-02 12:33:04 -08:00
libraryaddict
d6c3b330b5 Fix redis working on the same thread 2015-03-02 03:44:38 +13:00
Jonathan Williams
789e750cbf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-03-01 01:09:28 -08:00
libraryaddict
3f7eceb907 Disable redis being sent for player messaging and parties. 2015-03-01 17:40:52 +13:00
libraryaddict
3b4075392a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-03-01 15:16:15 +13:00
Jonathan Williams
e5189bea40 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-28 10:26:25 -08:00
Shaun Bennett
81a7e1f1f2 Better hover effect for treasure chests - also fixes hover only showing for old chests 2015-02-28 00:37:22 -05:00
Shaun Bennett
42600a0c70 Call direct methods in friends gui instead of running commands (prevents getting command spam errors when trying to mass add/delete friends) 2015-02-27 23:36:36 -05:00
Shaun Bennett
c916957a07 Fix block morph with treasure chests 2015-02-27 23:22:45 -05:00
Shaun Bennett
90ebbd9962 More refactors 2015-02-27 22:53:55 -05:00
libraryaddict
d23d146f35 Fix up admin message typos 2015-02-27 21:12:31 +13:00
Shaun Bennett
efce714375 DEVP-66 Refactor commonly used classes to Java conventions 
Refactoring + testing jira
 2015-02-26 00:07:07 -05:00
libraryaddict
d9184ad423 Disable /a for muted players 2015-02-25 23:20:40 +13:00
Shaun Bennett
cf7e2eed69 Merge with MPS Update 2015-02-24 21:11:16 -05:00
Shaun Bennett
45fd3cc537 Revert "Update JOOQ files, update IntelliJ config file for JIRA" 
This reverts commit db3f2989c0.
 2015-02-24 21:03:59 -05:00
libraryaddict
bfb0c157a2 Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths 2015-02-25 13:56:32 +13:00
Shaun Bennett
cea172a713 Give more cpu to SnrMod+/Youtube private servers 2015-02-24 17:39:02 -05:00
Shaun Bennett
47ef3617f4 Give SnrMod+/Youtube servers 2GB of ram instead of 1GB 2015-02-24 14:43:38 -05:00
Shaun Bennett
48dd5639d2 Kick banned players from games 2015-02-24 14:38:12 -05:00
libraryaddict
fc5771b33c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-24 13:04:06 +13:00
libraryaddict
56e03221ad Improve party system 2015-02-24 13:03:51 +13:00
Jonathan Williams
e1818a9c32 Fixed stat overrite bug. 2015-02-23 00:45:45 -08:00
Jonathan Williams
87558eb01a Merge pull request #10 in MIN/mineplex from leaderboards_dev to master 
* commit 'e1f7e2dbcc91bb79d393b09ea5b250fe895cfe11':
  Remove old lines of debug code.
  Add in hooks to update statistical events log for leaderboards. Modify leaderboard PHP script for new updated leaderboard table formats.
 2015-02-21 01:55:59 -06:00
Ty Sayers
e1f7e2dbcc Remove old lines of debug code. 2015-02-19 18:55:21 -05:00
Ty Sayers
def101cc8d Add in hooks to update statistical events log for leaderboards. 
Modify leaderboard PHP script for new updated leaderboard table formats.
 2015-02-19 18:53:46 -05:00
libraryaddict
0aee8042b5 Changed /locate to return the located players name, not fed target 2015-02-18 09:27:58 +13:00
libraryaddict
d29b43d645 Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages. 2015-02-17 15:17:14 +13:00
libraryaddict
3b0a131ca2 If private messaging is turned off, deny messages, even from friends. 2015-02-15 22:10:15 +13:00
libraryaddict
3ef3689e6d Fixed RedisMessageCallback not being registered 2015-02-15 22:01:10 +13:00
Jonathan Williams
fd0547d9d3 Added connection re-establishment to database calls if error occurs. 2015-02-14 22:50:52 -08:00
Jonathan Williams
c129deb201 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-14 22:05:24 -08:00
Jonathan Williams
17543910b5 Added Chest packages to support server. 
Fixed Punish not loading.
 2015-02-14 15:09:42 -08:00
Mini-Chiss
e33fd3f249 disallow people from talking about hacks in chat. 2015-02-15 09:01:55 +13:00
libraryaddict
0071d6220d Change locate command to moderators and up 2015-02-14 22:22:15 +13:00
Jonathan Williams
6ff0928fbd Fixed RB with exemption in NCP hooks. 2015-02-14 00:48:07 -08:00
libraryaddict
0cd0c61200 Add /locate|where|find command to find other players in other servers 2015-02-13 20:57:46 +13:00
Shaun Bennett
db3f2989c0 Update JOOQ files, update IntelliJ config file for JIRA 2015-02-12 14:17:04 -05:00
libraryaddict
876005b3e3 Fixed sending admin cross-server messages not setting last admin to 2015-02-12 22:27:09 +13:00
libraryaddict
858a6fb674 Fixed FriendsGUI not removing ghost items when redrawing page 2015-02-12 04:08:43 +13:00
libraryaddict
9bdf248643 Add cross-server message and adminmessage commands. Fixed casing on messagecommands package. 2015-02-12 04:08:06 +13:00
libraryaddict
1b11c5dbbf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-12 04:06:19 +13:00
libraryaddict
f41473da8f Add message to unignore when no parameters are given 2015-02-11 23:11:21 +13:00
Jonathan Williams
6383cf7ce6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-02-10 18:17:13 -08:00
Shaun Bennett
1b4d1d94e9 Merge remote-tracking branch 'origin/master' 2015-02-10 21:15:53 -05:00
Shaun Bennett
58eaaaa2ee Treasure fixes 2015-02-10 21:15:44 -05:00
Jonathan Williams
86b0a578ba Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 18:13:49 -08:00
Mini-Chiss
264ecfc362 lowered legendary chance on old chest slightly 2015-02-11 15:13:33 +13:00
Jonathan Williams
f0d2ff1c9d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 17:44:36 -08:00
Mini-Chiss
500e37a618 fixed ender chest shop item 2015-02-11 14:44:14 +13:00
Mini-Chiss
92d3a7dab8 all chests purchasable by coins 2015-02-11 14:42:41 +13:00
Mini-Chiss
cafa59d7e8 adjusted reward rarities 2015-02-11 14:16:08 +13:00
Jonathan Williams
258c1ca7fc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 02:27:05 -08:00
Mini-Chiss
d9521bd05a lowered gameloot chances 2015-02-10 23:26:37 +13:00
Jonathan Williams
4c0e6642f4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-10 02:12:23 -08:00
Jonathan Williams
3a912c13ec Add nocheat to MPS 2015-02-10 02:11:27 -08:00
Shaun Bennett
336ba50f59 Rename some enum values for treasures, update my packet change 2015-02-09 23:24:43 -05:00
Mini-Chiss
cb9246281c TEASURE! +R 2015-02-10 16:49:50 +13:00
Mini-Chiss
37a5024fcd more chest polish 2015-02-10 13:22:42 +13:00
Mini-Chiss
04d0a1cba1 fixed lore 2015-02-10 12:40:51 +13:00
Mini-Chiss
edddff503e Treasure ready ;o 2015-02-10 12:38:08 +13:00
Mini-Chiss
c1f9f94c2a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 12:23:28 +13:00
Mini-Chiss
6bbf9bd321 Ability to purchase old chests 2015-02-10 12:23:11 +13:00
Mini-Chiss
af95d3ba4e Treasure update 2015-02-10 12:09:37 +13:00
libraryaddict
c2c63f4fc0 Null check in MessageManager 2015-02-10 04:17:38 +13:00
libraryaddict
29f3241098 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-10 02:32:13 +13:00
libraryaddict
ce7db289a7 Add commands /ignore and /unignore. Fixed mutes not working with private messaging 2015-02-10 02:31:33 +13:00
libraryaddict
cf0134a577 Change commandmanager to cancel event if command is registered, despite not having permissions 2015-02-10 02:20:54 +13:00
Jonathan Williams
51e1798d8a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-02-09 00:19:15 -08:00
Jonathan Williams
c5b7e97623 Added NoCheatPlus hooks. 2015-02-09 00:18:51 -08:00
Jonathan Williams
fcba1db291 Fixed server transfer bug. 2015-02-09 00:15:45 -08:00
Jonathan Williams
f98d6e0534 Fixed personal servers overriding existing servergroups. 2015-02-09 00:15:18 -08:00
Mini-Chiss
26463ba75d Treasure changes :O 2015-02-09 20:24:20 +13:00
Shaun Bennett
c285fae035 Merge remote-tracking branch 'origin/master' 2015-02-06 23:40:14 -05:00
Shaun Bennett
b85494a037 Show player skins in friend gui 2015-02-06 23:40:06 -05:00
Shaun Bennett
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
libraryaddict
219ac93dc4 Don't allow the server to increment the mapcount information. 2015-02-07 16:06:53 +13:00
libraryaddict
c61f97d0eb Why didn't this get included in that previous commit.. 2015-02-07 03:54:19 +13:00
libraryaddict
8851cccff4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-02-07 03:53:17 +13:00
libraryaddict
68d1ba4507 Add API to create walls of maps to create a giant image. Please use responsibly. 2015-02-07 03:52:19 +13:00
Shaun Bennett
de1d2d4688 Just ignore this commit. Nothing fancy here! 2015-02-06 00:42:17 -05:00
Shaun Bennett
36b43af2c2 Fix inconsistency in friends gui 2015-02-06 00:14:46 -05:00
Shaun Bennett
48db23c862 Fix for enderchests closing after being opened, go shaun! 2015-02-06 00:10:17 -05:00
Shaun Bennett
922f2d5ee9 Merge remote-tracking branch 'origin/master' 2015-02-05 23:20:45 -05:00
Shaun Bennett
fcb3d20778 Move tablist stuff to portal, show current server on tablist 2015-02-05 23:20:39 -05:00
Chiss
14fc6f2145 Chest Update 2015-02-06 14:16:10 +11:00
Jonathan Williams
44bab01e33 Added NoCheatPlus hook for double jump fly hack prevention. 2015-02-04 21:52:14 -08:00
Chiss
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
Chiss
c7d4b14f4c Revert "Revert "Work on treasure............"" 
This reverts commit 49bfe385bf.
 2015-02-05 11:34:29 +11:00
libraryaddict
e91d76960c Add a toggleable friends GUI - Chat to Inventory and back 2015-02-03 22:03:07 +13:00
libraryaddict
ea24bc1d87 Prevent treasure chests being opened from interfering with portals, ladders, etc. 2015-02-01 12:19:33 +13:00