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

2297 Commits

Author SHA1 Message Date
AlexTheCoder
e165cad50f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-10 04:53:32 -05:00
Shaun Bennett
2707173a8b Merge with 1.8 Branch 2015-11-10 01:48:33 -05:00
Shaun Bennett
ec3427bcc0 Giveaway manager bug fix 2015-11-09 04:08:26 -05:00
NewGarbo
7a8a5918c0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/dataSources.xml
	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java

** CONFLICTS ALL FIXED **
 2015-11-09 08:59:37 +00:00
Shaun Bennett
05b52614fe Forgot to remove debug code for testing 2015-11-09 03:49:12 -05:00
Shaun Bennett
2eaa326929 Merge remote-tracking branch 'origin/master' 2015-11-09 03:27:50 -05:00
Shaun Bennett
2c54e9e59a Giveaway extras 2015-11-09 03:27:42 -05:00
Jonathan Williams
fb4978305f Fixed up EnjinTranslator 
Added extra overload for inventoryManager if you have the accountId already.
 2015-11-09 02:26:45 -06:00
Jonathan Williams
283a774e03 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-09 00:04:55 -06:00
Jonathan Williams
4915ebc5ad Added Purchase logging manager for Enjin. 
Added extra callback method for SaveRank.
 2015-11-09 00:04:38 -06:00
libraryaddict
d466005c35 Fix custom names not changing 2015-11-09 05:08:08 +13:00
libraryaddict
752d8152d2 Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master 
* commit '783bec75db7592dc191698b8dfbb89be08a818aa':
  Fix for some preferences not applying correctly.
 2015-11-08 08:23:20 -06:00
AlexTheCoder
dfbf19c66a Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-08 01:02:06 -05:00
libraryaddict
c4d6bcba02 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-08 17:56:34 +13:00
Cheese
cc2e5bc6e4 minestrike update! 2015-11-08 11:30:19 +11:00
Shaun Bennett
addde570bb Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 14:53:35 -05:00
Shaun Bennett
bf97cf5d77 Remove debug code 2015-11-07 13:53:34 -05:00
libraryaddict
79d0466355 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-11-07 21:36:36 +13:00
Shaun Bennett
ec7600a4a2 Giveaway tweaks 2015-11-07 01:10:27 -05:00
Shaun Bennett
4add7449eb Merge remote-tracking branch 'origin/master' 2015-11-06 21:15:45 -05:00
Shaun Bennett
3893617d58 Logitech Giveaway (still needs testing) 2015-11-06 21:15:37 -05:00
AlexTheCoder
fafc92606c Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
 2015-11-06 18:43:11 -05:00
Keir
783bec75db Fix for some preferences not applying correctly. 2015-11-06 23:04:51 +00:00
libraryaddict
cc0f12f6c8 Fix player interactions packets not working properly on armorstand and when clicking block behind entity 2015-11-07 04:45:02 +13:00
NewGarbo
b835823230 Preferences page changes to free up space, as the current preferences layout is completely full. 
Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.
 2015-11-06 13:19:02 +00:00
AlexTheCoder
87d7ff8a8f - Synced up expire times for proximity weapons 2015-11-05 02:21:36 -05:00
AlexTheCoder
61653347c7 - Fixed proximity weapons not being able to detonate 2015-11-05 02:11:20 -05:00
AlexTheCoder
9c49ab0408 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-05 01:23:40 -05:00
NewGarbo
3ff044fddb Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips 2015-11-04 11:32:06 +00:00
libraryaddict
b3f86ba638 Fixing bugs 2015-11-04 18:34:22 +13:00
NewGarbo
7f03ca0936 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
 2015-11-03 21:19:17 +00:00
NewGarbo
78ab895a14 Added heart particles to the GiantsBroadsword healing feature, also added some strong sounds. 
Made it so that players using the broadsword's effects cannot attack anything.

Added small smoke particle to UtilParticle.

Added a burnout feature to the WindBlade, disallowing players to speed around on the ground for ever.

Moved the Lapis Lazuli block particles from infront of the player, to the feet of the player when using the AlligatorsTooth, as per SamitoD's request.

Removed some debug messages thrown around the code.
 2015-11-03 19:49:14 +00:00
libraryaddict
3de906ab19 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
 2015-11-03 14:57:25 +13:00
Shaun Bennett
4794cc6924 Clans Gui 2015-11-02 20:41:08 -05:00
Jonathan Williams
8838ea75e4 Some code cleanup for tasks. 2015-11-02 09:37:11 -06:00
Jonathan Williams
3b38302429 Optimized TaskManager task locks and calls. 
Run all player messages on the main thread.
 2015-11-02 09:35:35 -06:00
Jonathan Williams
55d028d706 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-01 22:09:58 -06:00
Shaun Bennett
9cf62cfe7f Don't use player skulls until caching is setup and working properly 2015-11-01 22:58:22 -05:00
Jonathan Williams
cb96124feb Added extra cleanup for FriendsGUI and AddFriendPage 2015-11-01 17:42:23 -06:00
NewGarbo
baa4a744fb Fixed a whole load of bugs: 
Fixed the next button occasionally displaying a blank page in the gear GUI.
Fixed not being able to click the back button when selecting a bow in the gear GUI.
Made selectable items glowing in the gear GUI.
 2015-10-31 23:11:12 +00:00
Jonathan Williams
073321fb14 Refactored TrickOrTreat Stuff. 2015-10-31 14:45:42 -05:00
Cheese
b8b260bca1 fixed expire time on projectiles 2015-10-31 19:01:49 +11:00
Cheese
c463b80fe0 fixed insta-expire 2015-10-31 19:00:28 +11:00
Cheese
3636fdfba0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-31 18:23:06 +11:00
Cheese
225f067ab3 fixed some projectile stuff 2015-10-31 18:22:53 +11:00
Shaun Bennett
cd15df0238 Merge remote-tracking branch 'origin/master' 2015-10-31 02:13:24 -04:00
Cheese
23be8aa1dd removed unncessary stuff 
balanced rewards
 2015-10-31 14:33:41 +11:00
Cheese
a92a52f009 Merge branch 'Myst_TRICKORTREAT' 2015-10-31 14:27:06 +11:00
Mysticate
4884032a1a Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3 2015-10-30 23:24:32 -04:00
Cheese
b9d7c80f80 cow kit 2015-10-31 13:25:57 +11:00
libraryaddict
301b8012ff Final commit 2015-10-30 19:30:17 +13:00
libraryaddict
ea1e4b79f7 Changes from SnD branch 2015-10-30 19:25:02 +13:00
libraryaddict
ed18588a6a Fix missing code and stuff 2015-10-30 19:12:04 +13:00
Cheese
c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
AlexTheCoder
0be51d5629 - Even more bugfixes 2015-10-29 16:48:51 -04:00
Shaun Bennett
e2947718fe Remove code that wasnt meant to be commited 2015-10-29 13:10:10 -04:00
libraryaddict
0486404c4b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-10-28 14:38:34 +13:00
libraryaddict
5ec932d1ca Fixing bugs 2015-10-28 14:36:48 +13:00
AlexTheCoder
7770fa0284 - Added system to ensure banned players are removed from the network 2015-10-26 07:09:01 -04:00
AlexTheCoder
f5b4f28848 - Fixed achievements 
- Various balance patches/audio changes
 2015-10-26 00:25:33 -04:00
fooify
cbe147d705 typo fix in legendary aura description 2015-10-25 12:32:27 -07:00
fooify
7024084ce3 Update achievement kit reference text 2015-10-25 11:29:06 -07:00
fooify
bb806d6260 Merge remote-tracking branch 'origin/master' into foo 2015-10-25 10:10:06 -07:00
NewGarbo
327c129f46 Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}]) 2015-10-25 12:28:12 +00:00
Shaun Bennett
556d5adcd9 Change /global to /globalpacket (fixes conflict with announcement command) 2015-10-24 17:46:25 -04:00
NewGarbo
1e4b3442fa Conflicts: 
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
 2015-10-24 20:45:39 +01:00
Shaun Bennett
0d56eefd44 Titan/Rewards adjustments 2015-10-24 13:40:17 -04:00
Shaun Bennett
40afcaf26b Global Packet Commands 2015-10-23 15:07:53 -04:00
libraryaddict
2eb8b3e234 Catch PacketHandler exceptions 2015-10-24 02:17:19 +13:00
libraryaddict
5ec4203fd9 More changes to disguise 2015-10-24 01:36:42 +13:00
libraryaddict
a450b828b7 Fix disguises custom name 2015-10-24 00:48:54 +13:00
AlexTheCoder
f7dab72e8c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-10-23 03:23:35 -04:00
Cheese
af208da953 Merge branch 'alex-testrank' 2015-10-23 18:10:59 +11:00
Shaun Bennett
e3e7dd4694 Titan rewards from mythical chests 2015-10-23 02:08:31 -04:00
AlexTheCoder
1512d87f9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-23 00:28:32 -04:00
AlexTheCoder
5a94e33d5e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-10-23 00:24:52 -04:00
libraryaddict
aedf04b3e3 Fix renaming pet not opening proper window 2015-10-23 09:26:21 +13:00
libraryaddict
53aa1b655b Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix 2015-10-23 09:20:24 +13:00
libraryaddict
8cde506a2c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-23 05:25:36 +13:00
libraryaddict
ddb8d592f8 Remove all is1_8 checks 2015-10-22 18:37:14 +13:00
Shaun Bennett
00a689ea03 War work 2015-10-21 14:48:27 -04:00
Jonathan Williams
c719d693dd Added delete benefit call for repository. 
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
 2015-10-21 01:15:09 -05:00
NewGarbo
227e9f7bfc Pretty much finished with tutorials, not fully though, but I am simply pushing so I don't lose all my work. 
CHANGES----

Added a little hack to ScoreboardElement.java that allows for a single element to clear the currently existing scoreboard lines output, or modify it.

Coded in the functionality of 7 tasks, will do the rest now.
 2015-10-21 04:27:14 +01:00
Sarah
6860f013d0 Fixing some spelling typos chat filtering and the scoreboard. 2015-10-20 19:23:58 +02:00
libraryaddict
07f032a5d2 Fix wither pet making sounds, fixed worldtime. 2015-10-21 04:22:31 +13:00
libraryaddict
ddd674e371 Packets implement Pcaket right 2015-10-20 17:19:46 +13:00
libraryaddict
b3caf7c2d4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-20 04:38:12 +13:00
Jonathan Williams
3ef33bd9c5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-19 01:32:23 -05:00
Jonathan Williams
5e307da15a Fix for inventory failure. 2015-10-19 01:32:12 -05:00
Shaun Bennett
6d7f15cd6d Fix hub time after light flicker 2015-10-18 18:52:16 -04:00
libraryaddict
55f97ef984 More fixes, along with a fix for Block Hunt 2015-10-19 06:21:16 +13:00
Shaun Bennett
177e482dbc Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2015-10-18 12:35:31 -04:00
Jonathan Williams
9e7629b1fe Added 43k player chest benefit. 
Updated MOTD.
 2015-10-18 00:21:01 -05:00
AlexTheCoder
12319169a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
 2015-10-18 00:54:18 -04:00
libraryaddict
6f91827d57 Vector to Vector3f, updated Maze to 1.8 2015-10-18 12:40:01 +13:00
libraryaddict
02bf202d52 1.8 update 2015-10-17 13:21:03 +13:00
libraryaddict
3a0781b3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
 2015-10-17 00:10:32 +13:00
libraryaddict
14a524cf54 Stuff 2015-10-17 00:08:30 +13:00
libraryaddict
f71cb80bd0 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
 2015-10-16 22:26:07 +13:00
libraryaddict
70c76d976f More changes 2015-10-16 22:10:13 +13:00
Jonathan Williams
62b209fede Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-16 01:57:30 -05:00
Jonathan Williams
d00fa856f3 Fixed Pets so they work correctly. 
Also fixed legend benefits.
Fixed chest pet rewards.
 2015-10-16 01:57:19 -05:00
Cheese
577c67cacd Merge branch 'Myst_HALLOWEEN' 2015-10-16 14:18:35 +11:00
Mysticate
b15b81a7e2 Spacing 2015-10-15 23:09:23 -04:00
Cheese
6cc33fd6c6 Merge branch 'thanos-bug-fixes' 2015-10-16 12:53:43 +11:00
Mysticate
41511dce7b Merge remote-tracking branch 'origin/master' into monster-maze 2015-10-15 21:19:24 -04:00
libraryaddict
3dda9352e7 Progress 2015-10-16 13:32:23 +13:00
libraryaddict
4205dc6c25 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
 2015-10-15 12:34:34 +13:00
Shaun Bennett
0df637b80a Run punishBot in main server thread 2015-10-13 22:56:14 -04:00
Shaun Bennett
f683e932ae Clans merge fixes 2015-10-13 22:24:15 -04:00
Mysticate
a049d7666f Merge remote-tracking branch 'origin/master' into monster-maze 2015-10-13 22:14:19 -04:00
Cheese
45cd2a38e1 admins can botspam 2015-10-14 11:55:59 +11:00
Shaun Bennett
88709f85b6 Merge with master 2015-10-13 18:13:01 -04:00
Shaun Bennett
cb0d82174e Apply botspam to chat messages as well 2015-10-13 17:41:25 -04:00
Sarah
d925ae7f8d adding animation for Speed Boost, fixing mob item dropping. 2015-10-13 15:53:48 +02:00
Cheese
d105ea5d7e botspam addition 2015-10-13 23:19:48 +11:00
libraryaddict
58a86c5abb That's the easy stuff done.. 2015-10-13 19:49:15 +13:00
AlexTheCoder
e1d8b25e91 - Fix misc champs bugs 2015-10-13 01:24:57 -04:00
Cheese
f5b80c941c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-13 11:58:27 +11:00
Cheese
e8388437b6 botspam now checks for chat as well 2015-10-13 11:58:14 +11:00
AlexTheCoder
0bd026f506 - Fixed merge issues 2015-10-12 18:04:35 -04:00
AlexTheCoder
f497eab633 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-10-12 17:54:11 -04:00
Sarah
9010b8bfe9 removing some unneeded stuff and fixing tag overlaying 2015-10-12 22:01:23 +02:00
libraryaddict
cef52368a3 Hologram fixes 2015-10-13 08:59:13 +13:00
Sarah
ff7ebeed57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-10-12 20:23:34 +02:00
AlexTheCoder
bbb863ba92 - Merge conflict patch 2015-10-12 02:36:10 -04:00
Cheese
2b9a66e7b2 more ssm update 2015-10-12 16:32:23 +11:00
Shaun Bennett
1aecc9505c Add region to titan, new MOTD 2015-10-12 01:30:31 -04:00
AlexTheCoder
bef942f6da Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-12 00:47:56 -04:00
Cheese
6a173073a4 added flag to projectiles 
work on cow kit
 2015-10-12 14:39:14 +11:00
libraryaddict
dab258dcdd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Libraries/BungeeCord.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
	Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
 2015-10-12 16:22:52 +13:00
Mysticate
2abf3edad4 Made items for titanic cosmetics dyes. 2015-10-11 22:29:26 -04:00
Mysticate
b6d573a4d5 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-11 22:25:25 -04:00
Mysticate
7a4ccdf680 Bug fixes 2015-10-11 22:17:34 -04:00
Mysticate
20dd9c683b Merge remote-tracking branch 'origin/master' into monster-maze 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java

Changed the scoreboard a bit, added it to MPS.
 2015-10-11 10:52:45 -04:00
Jonathan Williams
e6485a9009 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 23:02:36 -06:00
Jonathan Williams
5866e0cce6 Reducing max connections for the DBPool to 3. 2015-10-10 23:02:08 -06:00
Cheese
f23bf18928 adhering to mysts OCD 2015-10-11 14:50:57 +11:00
Cheese
f3e2f3c145 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-11 14:48:17 +11:00
Cheese
cb9e8f8e0b pumpkin smasher achievement 2015-10-11 14:48:02 +11:00
Jonathan Williams
998d5f6984 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 21:25:29 -06:00
Jonathan Williams
061a7b7c73 Fixed Pet FK errors. 
Added SUPPORT to acceptable updateRank command.
 2015-10-10 21:24:47 -06:00
Cheese
6860fa608a titan placeholder perks 
art
fixed pumpkin gem count
 2015-10-11 11:26:09 +11:00
Cheese
323842c693 fixed mods staying in flight 2015-10-10 19:36:38 +11:00
Shaun Bennett
a242c6b592 Halloween Update finishes 2015-10-10 03:23:37 -04:00
Cheese
e9207acd7f Merge branch 'alex-halloween' 2015-10-10 17:38:09 +11:00
Cheese
7bc3b4970b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
 2015-10-10 17:34:17 +11:00
AlexTheCoder
67a1f4ce8d Titan Giveaway: 
- Added Titan pumpkin animation
Titan Perks (For later, Removed from Menu):
- Added Kronos Particle
 2015-10-10 02:31:52 -04:00
Mysticate
930cfa5cb8 DONE 2015-10-10 02:30:11 -04:00
Shaun Bennett
f1e9acbb58 Titan giveaway 2015-10-10 02:19:05 -04:00
Mysticate
9a7357e484 Work 2015-10-10 01:00:49 -04:00
Shaun Bennett
36fabf93b6 Merge remote-tracking branch 'origin/master' 2015-10-09 23:14:13 -04:00
Shaun Bennett
bc7bf8a2e2 fixes/debug 2015-10-09 23:13:39 -04:00
Jonathan Williams
512e08af19 Removed all create table statements. 2015-10-09 21:02:35 -06:00
Mysticate
7851cb451a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
 2015-10-09 22:34:05 -04:00
Shaun Bennett
aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Peter Miller
611fb88f15 Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load). 2015-10-09 20:40:50 -04:00
Cheese
d99c64e45d fixed merge error 2015-10-10 10:37:20 +11:00
Cheese
02c6eccfda Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
 2015-10-10 10:36:42 +11:00
Cheese
7dbd9da582 dragon sale Bar 2015-10-10 10:35:48 +11:00
Shaun Bennett
ba36ff565d Merge remote-tracking branch 'origin/master' 2015-10-09 18:23:55 -04:00
Shaun Bennett
97ef4a4252 Pushing titan giveaway stuff for laptop 2015-10-09 18:23:47 -04:00
Jonathan Williams
586cc6e3e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-09 09:40:58 -06:00
xGamingDudex
ba171f95c6 Fixed UtilEnt.isGrounded for non-player entities. 
Updated UtilEnt.isGrounded(Entity) to only apply custom handling of
players. Non-player entities now uses the default .isOnGround() check.
Implemented to fix entities like minecart which applies custom
is-on-ground checks.
 2015-10-09 14:42:38 +02:00
Cheese
ff42e05a8d Merge branch 'Myst_HALLOWEEN' 2015-10-09 14:20:58 +11:00
Mysticate
fb4d08931c Spider mount improvements. 2015-10-08 23:18:37 -04:00
Cheese
d9dd471db6 removed annoying debug 2015-10-09 14:04:12 +11:00
Mysticate
90d0fcb36d Merge branch 'Myst_HALLOWEEN' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN 2015-10-08 22:53:45 -04:00
Mysticate
598ea84e7a Fixed explosions and cleaned up. 2015-10-08 22:52:57 -04:00
Cheese
d18353e592 Merge branch 'Myst_HALLOWEEN' of ssh://184.154.0.242:7999/min/Mineplex into Myst_HALLOWEEN 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
 2015-10-09 13:44:41 +11:00
Mysticate
082b16fe0d Stuff and things to help make mounts be cool. 2015-10-08 22:28:07 -04:00
Cheese
54c76c9d9c fixed text 2015-10-09 12:27:30 +11:00
Cheese
a234fbce1e Merge branch 'Myst_HALLOWEEN' 2015-10-09 12:17:57 +11:00
Mysticate
ed31bf9886 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-08 21:16:24 -04:00
Mysticate
9254ca9162 K reverted + fixed bug 2015-10-08 21:12:38 -04:00
Cheese
24568a40f3 Merge branch 'Myst_HALLOWEEN' 2015-10-09 12:05:24 +11:00
Cheese
483ab13c2b workaround for error where accountid is never set 2015-10-09 12:04:35 +11:00
Cheese
17ba04348d stats debug 2015-10-09 11:53:08 +11:00
Mysticate
84cbee4535 Fixed it again 2015-10-08 20:52:17 -04:00
Mysticate
145832b326 Fixed mounts bc chiss is bad 2015-10-08 20:50:39 -04:00
Cheese
21dc0dc962 Merge branch 'Myst_HALLOWEEN' 2015-10-09 11:47:20 +11:00
Cheese
ec5694737c statsmanager debug 
rank fix
 2015-10-09 11:44:12 +11:00
Mysticate
8a8591ae7f Merge branch 'master' of 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
Myst_HALLOWEEN

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
 2015-10-07 22:19:10 -04:00
Mysticate
668454f156 Fixed things 2015-10-07 22:10:57 -04:00
Mysticate
f2485854ef Improved spider. 2015-10-07 22:06:57 -04:00
Mysticate
70f3ccf703 Fixed spider morph 2015-10-07 21:53:23 -04:00
Mysticate
e864e0867a Adds mount spider and fixes a BH bug. 2015-10-07 21:47:10 -04:00
Cheese
f28d83cbd7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-08 12:05:51 +11:00
Cheese
c94184c5ae reduced number of falling blocks in skywars by 80% 
added halloween horror mount
 2015-10-08 12:04:28 +11:00
fooify
a177b0cd43 Merge remote-tracking branch 'origin/master' into foo 2015-10-06 16:45:01 -07:00
Shaun Bennett
8fb82507e1 Merge remote-tracking branch 'origin/master' 2015-10-06 12:24:34 -04:00
Shaun Bennett
9cb3f250e2 Remove streak record data until a better solution is done 2015-10-06 12:24:16 -04:00
Cheese
e2e2356b04 stuffs 2015-10-06 13:25:15 +11:00
Sarah
6e0e618e03 Finishing Achievements. 2015-10-06 03:20:25 +02:00
Thanos paravantis
c2518bc6c4 Some additional bug fixes were applied on the previous commit. 
Water damage by TNT on game lobbies is now patched.
 2015-10-04 16:32:34 +03:00
Jonathan Williams
ba17404212 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-04 00:20:52 -05:00
Jonathan Williams
1830705692 Removed ItemCategories to reduce strain on the database with queries that are more complex than they need to be. 
Increased Firework recharge time.
 2015-10-04 00:20:41 -05:00
Ty Sayers
17fbd42b9c Fix bug where a players inventory was not properly updated after switching to SURVIVAL mode, causing CustomGear items to remain unhidden an JSON encoded. 2015-10-02 14:30:39 -04:00
Ty Sayers
661bba3714 Fix offensive skill exploit where players could swap hotbar slots quickly and keep their original offensive spell casting for a large damage and speed advantage (running and attacking). Fix bug edge-case where outgoing slot packets were being missed, causing players CustomGear items to improperly display encoded JSON data instead of a user-friendly item description. 2015-10-02 13:57:46 -04:00
Shaun Bennett
993c9783ec Add Votifier Jar, display team stats for SG, SW, SSM 2015-10-02 13:15:02 -04:00
Shaun Bennett
5bce1b5f2e Fix merge issues, fix observer command 2015-10-01 22:57:39 -04:00
Jonathan Williams
bc84dc6817 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-01 07:39:17 -07:00
Jonathan Williams
631bd9cfa6 Removed sale notification. 
Removed queue create table query.

Added try-catch for ServerMonitor to prevent stat storage from affecting normal operation.
 2015-10-01 07:38:59 -07:00
Mysticate
a6d7cccbe5 Fixes 2015-09-30 22:31:03 -04:00
Ty Sayers
b4c9bfbb57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
 2015-09-29 18:09:52 -04:00
Ty Sayers
ab1ac379a7 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-09-29 17:36:51 -04:00
Ty Sayers
bc7615a5c3 Fix Illusion bug causing the Illusion clone to not properly function and spawn inside Clan territories. Fix bug where Carrots and Potatoes purchased from the Produce shop could not be eaten. Fix bug with SQL query when adding new enemies and not initialized 'initiator' field with a proper value. Modify starting score values for clan wars to 0 instead of 20. Update CustomItem descriptions with bullet points instead of hyphens for more readable stats. Reword error messages associated with trusting non-allied clans to be more intuitive to players. 2015-09-29 17:36:42 -04:00
Shaun Bennett
437e62c7db Fix priority for dupe fix 2015-09-28 20:44:57 -04:00
Shaun Bennett
8a9cc9ff14 Food Dupe Fix 2015-09-28 20:42:14 -04:00
Shaun Bennett
92436c8f9d Merge pull request #60 in MIN/mineplex from alex-bugfixes to master 
* commit '8a94602aefc1e4ea3490da434f14205f99ba1d8e':
  Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text
  Made rank unlock lore colored based on rank required for item (QA Requested)
  Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.
  Marked the Bunny Morph to reflect its no longer available status
  Fixed previous ownership not being transferred
  Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
  Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui
 2015-09-27 22:39:50 -05:00
Jonathan Williams
eae894c879 Merge pull request #65 in MIN/mineplex from mrsomeone12_SmallFixes to master 
* commit '436f63860ecef028d23dae28ceb52e466e90270b':
  NBT overflow patch
 2015-09-26 17:32:30 -05:00
Jonathan Williams
ee5934c7aa Fix for punishments to match names exactly 
Fix for expiring ranks.
Fix for EU Lobby count.
 2015-09-26 18:31:37 -04:00
xGamingDudex
436f63860e NBT overflow patch 
Patch for the NBT overflow exploit which allowed any player to overflow
and drain the server for memory making it freeze and eventually crash.
 2015-09-26 01:48:38 +02:00
AlexTheCoder
7c04e5608d - Added new achievement 'Clutch' 
- Made new achievements needed for achievement skills
 2015-09-25 04:17:20 -04:00
AlexTheCoder
5b42d25bff - Added achievement and stat stuff 
- Fixed banner bugs
 2015-09-24 23:16:44 -04:00
libraryaddict
e94eb056dc Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-09-25 14:09:18 +12:00
libraryaddict
34d535f153 Fix custom tags, improve Packet handling 2015-09-25 14:07:51 +12:00
libraryaddict
fa30ba1e16 Fix a small issue with Future Disguises 2015-09-25 14:07:12 +12:00
AlexTheCoder
cd33bf8dd8 - Fixed updaterank and testrank scoreboard conflict 2015-09-24 11:47:50 -04:00
AlexTheCoder
a488bfab3e - Rewritten testrank system 
- Multiple rank improvements for real-time use
- Removed /updaterank from Jr.Dev
 2015-09-24 11:44:45 -04:00
Mysticate
125b823a65 Fixed achievement arcade page size. 2015-09-23 15:43:14 -04:00
Mysticate
84331901d4 Added achievements and final polish. 2015-09-23 15:18:44 -04:00
AlexTheCoder
c709980db3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-09-23 13:08:25 -04:00
Shaun Bennett
2b902c5193 Add created by, enabled by, and disabled by to botspam module 2015-09-23 00:25:39 -04:00
Ty Sayers
3a8fd18d2e Disable the ability to craft Fishing Rods. Fix bug where players could use the Blink or Flash skills to bypass borders on negative coordinate sides of the map and die to border control. Fix bug where players could open the enchantment table GUI and enchant items when shift clicking without an item. Fix bug where players couldn't place blocks on top of Anvils. Fix NPE bug with players clicking on Anvils while not holding an item. Fix bug where the '/c home' command cooldown was reset on a players death, allowing for abuse. Fix duplication bug where BlockToss could be exploited inside claims by throwing valuable blocks into water blocks. Fix bug where players could lose items to NPC shop inventories using inventory drag skills to drag items across open slots. Cap the member size of a clan to 20 and maximum available claim count to 8. 2015-09-22 15:28:06 -05:00
Shaun Bennett
cf618abd4e BotSpam Module 2015-09-22 01:38:45 -04:00
libraryaddict
452e8a9694 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-09-19 12:11:21 +12:00
libraryaddict
8015f5428d Flags stuff 2015-09-19 08:36:23 +12:00
Shaun Bennett
901dad2f8a Add vote3 to bonusmanager 2015-09-17 22:31:18 -04:00
libraryaddict
5e8fc77164 Add pages to spectator and in-progress server menu 2015-09-17 04:34:45 +12:00
Cheese
ac269839c5 squid skill 2015-09-14 14:14:06 +10:00
fooify
2de7fff267 Merge remote-tracking branch 'origin/master' into monster-maze 2015-09-13 08:45:34 -07:00
Sarah
216c8783a9 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-09-13 03:51:06 +02:00
Jonathan Williams
1417d31b73 Added 60s delay to timings enable check. 2015-09-11 23:57:26 -07:00
Jonathan Williams
a7d4a7534f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-09-11 22:51:04 -07:00
Jonathan Williams
2380b9041d Added automatic timings report in the event of lag. 
Added more exception handling around LoadingWindow
 2015-09-11 22:50:53 -07:00
Cheese
4184fe20cf minor fixes 2015-09-12 14:09:04 +10:00
Ty Sayers
9be0ecc598 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java

Additionally: Disable Endermen and Horses from spawning on the server. Fix bug where players could shoot others from within spawn and throw cobwebs from inside spawn. Fix bug where players could use the Travel Hub while combat tagged. Fix bug where Water flowed into Spawn areas. Fix bug where players could abuse BlockToss to pick up water blocks and throw them inside restricted liquid areas. Fix bug where Fissure created cracked StoneBricks which could be exploited for base raiding. Re-organize some Spawn/Safe Zone related logic into a more intuitive location (Spawn class) and add more descriptive documentation to event handlers in Spawn.
 2015-09-11 17:01:04 -05:00
libraryaddict
6474f5a9e9 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-09-06 16:23:18 +12:00
Jonathan Williams
4bb100b6be Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-09-05 01:53:45 -07:00
Jonathan Williams
2536d8a437 Fixed out of range stats causing no stats to load. 
Issue fix to db for out of range stat on login.
 2015-09-05 01:40:56 -07:00
Cheese
0ac808ba43 stacker pref is now only for pvp stacking. 2015-09-05 10:30:11 +10:00
Cheese
fc5ccd4a5e fixed 'self scoring' in Soccer 
removed silverfish on wither pet despawn
 2015-09-05 10:04:54 +10:00
libraryaddict
21d9f5767e CustomTagFix support changing and removing of names. 2015-09-04 19:23:33 +12:00
AlexTheCoder
f05cdd4915 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-09-04 02:57:47 -04:00
Jonathan Williams
890c9d59e1 Fixed loading window bug. 
Added default rank for CoreClient in case of bugged login.
 2015-09-03 09:38:02 -07:00
AlexTheCoder
9dc90b0e13 Added CTF to Champions stat group 2015-09-01 01:26:35 -04:00
AlexTheCoder
8a94602aef Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text 2015-08-31 16:03:27 -04:00
AlexTheCoder
fe4586852c Made rank unlock lore colored based on rank required for item (QA Requested) 2015-08-31 15:59:53 -04:00
AlexTheCoder
cbb0d4521c Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for. 2015-08-31 15:49:31 -04:00
AlexTheCoder
5322e9d018 Marked the Bunny Morph to reflect its no longer available status 2015-08-31 15:48:25 -04:00
AlexTheCoder
24fed013ae Fixed previous ownership not being transferred 2015-08-31 15:39:04 -04:00
AlexTheCoder
b63843930f Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui 2015-08-31 15:08:42 -04:00
AlexTheCoder
e93db405d0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-08-31 04:48:43 -04:00
AlexTheCoder
788ec97d38 Added CTF wins to achievements for champions 2015-08-31 04:39:07 -04:00
Jonathan Williams
c61f9ce3c8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-31 00:53:23 -07:00
Jonathan Williams
740899c09e Added dummy CoreClient in the rare event a player joins and gets disconnected during the join event????Weird 
Fixes Lobby crashes.
 2015-08-31 00:53:07 -07:00
Ty Sayers
6bb4e69236 Fix bug where players could shift-click items into shop page and lose it forever. Fixed bug where players couldn't place blocks against Anvils/Enchantment Tables while crouched. Fixed bug where clans could enemy other clans that had vastly fewer members than them. Fix bug where CustomGear items broke when a player entered Creative gamemode. Fixed bug where CustomGear suffix attributes did not properly format names. Fixed bug where the Frosted weapon attribute did not properly apply it's slowness effects to enemies. 2015-08-30 17:05:45 -07:00
Mini-Chiss
d79794c6d3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-30 15:47:57 -07:00
Mini-Chiss
bb66d47e8e meow 2015-08-30 15:47:49 -07:00
Ty Sayers
b0efe35531 Add restriction to ServerCommand that prevents players from directly connection to a Clans-X server, and instead insists that they join through a Clans hub. 2015-08-30 13:14:01 -07:00
Shaun Bennett
908d11ead5 Disable staff from joining the full server, Fix clans login manager, fix undead camp not spawning, fix clans admin command for all players, enable server for mapdev+, add TNT, generator, and class shop back to pvp shop, fix land claiming query 2015-08-30 12:00:58 -07:00
AlexTheCoder
eca69a8ae2 Made new branch up to date and including previous branch's code 2015-08-30 03:58:58 -04:00
Shaun Bennett
c27fdf023c Fix login manager and stats manager 2015-08-29 17:18:14 -07:00
Jonathan Williams
4e32bad8dd Fixed bug with stats pulling as int. 
Fixed bug with Poll recording selections wrong.
 2015-08-29 14:54:57 -07:00
Ty Sayers
aad5942242 Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server. 2015-08-29 14:46:18 -07:00
Jonathan Williams
f8729cbd66 Fixed Gadget. 2015-08-28 23:47:27 -07:00
Mini-Chiss
d35b5940fc fixed achievements 2015-08-28 23:30:21 -07:00
Mini-Chiss
5ae01f95a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-28 23:27:35 -07:00
Mini-Chiss
181afaa2d6 Merge branch 'Myst_EVO' 2015-08-28 23:25:51 -07:00
Mysticate
b71bcfab4b Fixed achievements. Merge ASAP 2015-08-29 00:19:39 -06:00
Jonathan Williams
d4d0c4bed6 Updated Motd. 2015-08-28 23:17:14 -07:00
Jonathan Williams
c98a85c2ba Added local storage of login time. 
Hooked in onlineTime bonus feature to real values.
 2015-08-28 22:09:42 -07:00
Jonathan Williams
ad4ba010b7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-28 20:59:08 -07:00
Jonathan Williams
6f0309622c Removed AccountCache. 
Converted that to PlayerCache and store account id in there.
 2015-08-28 20:58:58 -07:00
Mysticate
ebd3fbe6d5 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-28 20:19:27 -06:00
Jonathan Williams
e9b33668bc Added donorsOnline to MinecraftServer snapshot 
Refactored Rank class to use lowercase methods.
 2015-08-28 13:22:04 -07:00
Shaun Bennett
6f39c072a4 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-28 12:57:13 -07:00
Shaun Bennett
7761ca7e6f Remove debug messages 2015-08-28 12:56:43 -07:00
Ty Sayers
b98cde8b80 Fix bug where players couldn't move items in their inventory to sell gold tokens to shop. Reduce knockback amount on HeavyArrow skill for Ranger class. Prevent players who do not have the Ranger or Assassin class from being able to shoot bows. Add notification message on Smelting feature to reduce confusion among players. Fix bug with Building shop where the listed sell price and actual sell price weren't synced properly. Fix bug with all shops where purchasing items in bulk failed. 2015-08-28 12:52:02 -07:00
Shaun Bennett
cd145324d8 Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit 2015-08-28 12:00:23 -07:00
Ty Sayers
783f526b76 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-27 14:42:41 -07:00
Ty Sayers
4dcd54a9b0 Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans. 2015-08-27 14:42:07 -07:00
libraryaddict
379ee9271a Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta 
* commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b':
  Iron Wizard, fixed iron golem custom name
  Push golem block shot as per request
 2015-08-27 16:34:46 -05:00
libraryaddict
9d3f125c9e Iron Wizard, fixed iron golem custom name 2015-08-27 14:18:10 -07:00
Shaun Bennett
b0ee2bb669 Fix purple/black item bug, fix clans/ally chat bug with no clan, murder changes, drop player gold as items on death, add lore to crafted items 2015-08-27 13:57:57 -07:00
Mysticate
f2f6afb6ca Fixes :D 2015-08-26 20:10:58 -06:00
Ty Sayers
c20d2c9516 Fix bug with economy gold additions/reductions not properly working and causing shops to fail. Fix bug with region resetting command and streamline the claiming of server-based faction chunks for Spawn, Shops, Fields and Borderlands. 2015-08-26 17:37:31 -07:00
Mysticate
cfdb0dfa4f Added kits + achievements. Hurrah! 2015-08-26 13:19:17 -06:00
Sarah
15aca5dca9 Making the mob spawning prototype. still have to figure out how to move them properly. 2015-08-26 00:59:28 +02:00
fooify
64ca6ecce0 Merge remote-tracking branch 'origin/master' into foo 2015-08-25 08:20:37 -07:00
Shaun Bennett
062328313e Fix errors 2015-08-24 22:24:26 -05:00
Shaun Bennett
bf1f62057c Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta 
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
 2015-08-24 22:15:08 -05:00
Shaun Bennett
6841cbac69 Clans bug fixes + shop updates 2015-08-24 22:03:26 -05:00
Ty Sayers
69afefd66f Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java

Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.
 2015-08-24 20:55:29 -04:00
fooify
2e016de9e5 Fixed ignore command, now works 2015-08-24 14:07:21 -07:00
Jonathan Williams
6d3c965f14 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-23 16:26:02 -07:00
Jonathan Williams
1e7f2f01a7 Fixed problem where UUID api was preventing client loading from db. 2015-08-23 15:38:43 -07:00
Ty Sayers
a9f5197c64 Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Database/src/mineplex/database/Account.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
 2015-08-22 15:18:51 -04:00
Ty Sayers
6c9a99fa1b Fix soup consumption bug that didn't allow left clicking for use. Fix bug with item frames being destroyed inside spawn zones. Fix bug with bow deficient classes not properly receiving damage reductions on their bow attacks. Fix bug with Whirlwind Axe skill being enabled in Clans settings. Fix bug where bank related shop buttons functioned as gold token purchasables for error-displaying icons. Increasing duration on potion application from custom gear to prevent shaking inventory screen. Fix bug with gold balance changes (add/remove) weren't taking place synchronously, leading to the ability for duplication of gold and items. Fix bug where enemy'd Clans could be allied or neutral'd, as well as signaling that at-war clans were neutral. Fix bug where clans could unclaim admin chunks and ally chunks. Decrease the rate at which hunger decreases to be more accordance with 1.6 food systems. Disable Flint & Steel, Enderpearls, and Witch spawning. 2015-08-22 15:06:05 -04:00
libraryaddict
cdc92f8b2f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-22 00:38:55 +12:00
libraryaddict
7841b17d03 Add PacketPlayOutCamera for locking view to entity 2015-08-22 00:38:37 +12:00
libraryaddict
bad339cf04 Tweak dead bodies more 2015-08-21 20:52:57 +12:00
libraryaddict
c41328d726 Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games 2015-08-21 20:40:09 +12:00
libraryaddict
39ede2064a Bosses game progress 2015-08-21 16:12:26 +12:00
Mini-Chiss
15c873392a updated give to allow naming of items. 2015-08-20 20:38:07 +02:00
Jonathan Williams
bbe5b79c7e Disabled AntiHack create table. 
Fixed NPE with ServerManager
 2015-08-19 04:11:34 -05:00
Mini-Chiss
14bf8faf3a disabled big sale 2015-08-18 09:49:53 +02:00
fooify
d489b31738 merge 2015-08-17 16:27:28 -07:00
Mini-Chiss
b7854e6cab added big larry to chests 2015-08-17 13:05:41 +02:00
Mini-Chiss
9eed03237b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-17 12:39:06 +02:00
Mini-Chiss
58e517a4d7 fixed null args more 2015-08-17 12:38:41 +02:00
Shaun Bennett
8ab8388344 Merge remote-tracking branch 'origin/master' 2015-08-17 05:05:36 -05:00
Shaun Bennett
5c71522b2d Return the first UUID instead of last (AccountRepository) 2015-08-17 05:05:25 -05:00
Mini-Chiss
0a23f91592 fixed two little bogs 2015-08-17 11:53:50 +02:00
Mini-Chiss
7a7543886f fixed a ton of commands NPEing on no args 2015-08-17 09:04:39 +02:00
Shaun Bennett
555908a3c1 Rename preferences gui, add shop items for gold and emeralds (commented out right now), fix typo 2015-08-15 02:03:46 -05:00
Shaun Bennett
fda052ea90 Add treasure chest stats 2015-08-14 21:34:37 -05:00
Shaun Bennett
e89961380b Merge remote-tracking branch 'origin/master' 2015-08-14 21:14:41 -05:00
Shaun Bennett
1eaa6446af Fix double hologram and hopefully NPE 2015-08-14 21:14:34 -05:00
Shaun Bennett
c520bd7921 Add recharge to carl spins so that they don't get triggered twice 2015-08-14 20:43:58 -05:00
libraryaddict
a1ea03f74b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/.idea/modules.xml
	Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
	Plugins/Mineplex.Database/src/mineplex/database/Routines.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-08-14 19:44:56 +12:00
Jonathan Williams
a2d7aa77fe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-14 00:37:55 -05:00
Jonathan Williams
f5d934fe53 Fixed sync db calls for pets. 
Make sure to add/remove pets in mysql.
 2015-08-14 00:37:43 -05:00
Shaun Bennett
0b4dbab871 Change ticket command access to admin 2015-08-13 11:23:29 -05:00
Shaun Bennett
bd7317cf7b Fix ticket command rollback >:D 2015-08-13 11:03:12 -05:00
Shaun Bennett
bc8aff31cb Merge remote-tracking branch 'origin/master' 2015-08-13 06:12:24 -05:00
Shaun Bennett
af15476f19 Use login query to handle logins 2015-08-13 06:12:11 -05:00
Mini-Chiss
878ac82ade fixed error! 2015-08-13 13:01:41 +02:00
Mini-Chiss
1487692609 completely disabled team armor in arcade. avoids typing it just as game starts. 2015-08-13 12:57:30 +02:00
Mini-Chiss
fc1a8e4e25 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-13 12:52:11 +02:00
Mini-Chiss
f3b58fe9b6 disabled team armor command in games D: 2015-08-13 12:51:57 +02:00
Shaun Bennett
e1d04354fb Use dummy record for AddPlayer 2015-08-13 05:18:53 -05:00
Shaun Bennett
4d6e827739 Remove vote3! 2015-08-13 04:03:03 -05:00
Shaun Bennett
92c0e1452b Add vote3 2015-08-13 04:01:53 -05:00
Shaun Bennett
0c68321e81 Global button 2015-08-13 03:58:05 -05:00
Shaun Bennett
11a4805c38 Stat stuff! 2015-08-13 03:54:23 -05:00
Shaun Bennett
4aac057956 Merge remote-tracking branch 'origin/master' 2015-08-13 03:32:40 -05:00
Shaun Bennett
05b1b91686 Carl! 2015-08-13 03:32:31 -05:00
Jonathan Williams
8476578bc0 Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master 
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
  Various Fixes.
 2015-08-13 01:52:16 -05:00
Jonathan Williams
a308244966 Merge pull request #29 in MIN/mineplex from foo to master 
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
  minor grammar issue
  remove duplicate method
  manually updating something
  *crosses fingers* please work!
  please work...
  Freezes the time using doDayLightCycle instead of using a UpdateEvent.
  Fixed double-half-slabs (line 68)
  remove custom level to fix merge conflicts
  squirrel!
  fix getting snowballs from bedrock
  add jnr_dev to updaterank
  fix this agaaaaain
  FOOIFY IS A NOOB OKAY
  fix concurrentmodificationexception
  fix turfforts bug
  prevent STATIONARY_LAVA from breaking in creeper smash
  fix creeper smash exploding lava and bedrock
  fix spleef lava issue
  ishh also wanted this :P (let me know if I should remove it)
  ishh wanted it...k
  ...
 2015-08-13 01:49:00 -05:00
Shaun Bennett
37e5e97020 Fix experience reward displaying as game 2015-08-12 03:08:40 -05:00
Shaun Bennett
f81f5d82d6 Merge remote-tracking branch 'origin/master' 2015-08-12 03:00:16 -05:00
Shaun Bennett
30f20801c7 Lets hope everything works! 2015-08-12 03:00:07 -05:00
Mini-Chiss
860127631c fixed item insta-despawn 2015-08-12 09:27:05 +02:00
Mini-Chiss
ade76791b3 optimized item cleaning 2015-08-12 09:12:49 +02:00
Sarah
a1ba0f6d86 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-08-12 09:01:20 +02:00
Sarah
2a40eee9e7 Increasing radius of items despawning. 2015-08-12 09:00:13 +02:00
Mini-Chiss
7ea148a802 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-12 08:58:36 +02:00
Sarah
e4eb286225 Fixing despawning. 2015-08-12 08:56:20 +02:00
Mini-Chiss
c00f9a7aaa Merge branch 'Bonus' 2015-08-12 08:39:31 +02:00
Sarah
be699558f1 Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus 2015-08-12 08:38:18 +02:00
Sarah
af19754bcd Implementing Carl to Arcade. 2015-08-12 08:37:54 +02:00
Mini-Chiss
e8963cc2af fixed paintbrush 2015-08-12 08:10:43 +02:00
Mini-Chiss
2ed388552b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-12 07:59:39 +02:00
Shaun Bennett
99a94251fd Fixes 2015-08-12 00:56:20 -05:00
Shaun Bennett
8e4ae35256 Merge remote-tracking branch 'remotes/origin/master' into Bonus 2015-08-12 00:56:04 -05:00
Shaun Bennett
4549c810d4 Fix for voting 2015-08-11 22:59:59 -05:00
Mini-Chiss
a7cc3e1aa6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-11 21:13:59 +02:00
Mini-Chiss
d41ab3432f remove paintbrush when moved away 2015-08-11 21:13:45 +02:00
libraryaddict
72adf21bff Gadget Paintball: Add particles on impact, change block break effect to stone break sound. 2015-08-12 06:23:13 +12:00
fooify
10f979772b Merge remote-tracking branch 'origin/master' into foo 2015-08-11 09:51:13 -07:00
Mini-Chiss
83a010c215 enabled summer sale msg 2015-08-11 17:05:41 +02:00
Mini-Chiss
89dab7ec85 some little fixes 2015-08-11 16:33:32 +02:00
Sarah
f7d9476191 Hidden egg fix 2015-08-11 13:53:36 +02:00
Sarah
5c7d140521 Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus 2015-08-11 13:49:53 +02:00
Sarah
e25558fc91 Animation improvements. 2015-08-11 13:49:06 +02:00
Mini-Chiss
49d54d4dd3 doesnt count rank thingy as reward if no rank. yknow 2015-08-11 13:22:58 +02:00
Sarah
2d7d7f6dde Improving messages, animations and some Items. 2015-08-11 13:01:20 +02:00
Sarah
f3558b144c Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus 2015-08-11 12:05:23 +02:00
Sarah
c821523240 removed vote broadcast. 2015-08-11 12:04:54 +02:00
Shaun Bennett
1c484367a1 Add hasPoll 2015-08-11 04:57:45 -05:00
Shaun Bennett
3eb7e91fbb Removing the magical 3 2015-08-11 04:38:37 -05:00
Sarah
8abefaf856 The magical +3. 2015-08-11 11:31:51 +02:00
Mini-Chiss
4c32f32ced removed game reward type 2015-08-11 11:17:20 +02:00
Mini-Chiss
74b83d6851 fixed! 2015-08-11 10:56:07 +02:00
Mini-Chiss
184feec875 cleany and logic 2015-08-11 10:54:24 +02:00
Mini-Chiss
f66a0439e8 no need to gen so many 2015-08-11 10:34:33 +02:00
Mini-Chiss
a1c10a7ec5 clean up 2015-08-11 10:33:44 +02:00
Mini-Chiss
1c40478e6e SPIN DOGGY SPIN 2015-08-11 10:32:49 +02:00
Shaun Bennett
fe153bee11 Fix revert issues 2015-08-11 03:19:27 -05:00
Shaun Bennett
184c592786 Merge remote-tracking branch 'origin/Bonus' into Bonus 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
	Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java
 2015-08-11 03:12:55 -05:00
Shaun Bennett
13e7e58986 Creeper visual! 2015-08-11 03:09:21 -05:00
Shaun Bennett
c177307f70 Votifier fixes 2015-08-11 02:53:54 -05:00
Sarah
b99c526169 Implementing Carl message. 2015-08-11 09:09:16 +02:00
Shaun Bennett
5d3503b733 Carl rewards 2015-08-11 01:55:27 -05:00
Shaun Bennett
d2983b831e Merge remote-tracking branch 'origin/Bonus' into Bonus 2015-08-11 00:35:44 -06:00
Shaun Bennett
d833385df4 Fix carl spinner and ticket command, Fix polls not displaying in available count, Visual fixes 2015-08-11 00:35:02 -06:00
Mini-Chiss
66f2a5df5e renamed GAME 2015-08-11 08:32:12 +02:00
Sarah
3bedc4ce84 Improving animation timing. 2015-08-11 05:37:58 +02:00
Mysticate
bd414cd231 Merge remote-tracking branch 'origin/master' into Myst_EVO 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
 2015-08-10 19:47:53 -04:00
Sarah
186e3028c2 removing temp fix "there was an error processing your request" for the Spinner. 2015-08-10 17:15:56 +02:00
Sarah
3be811e480 Fixing Spinner announcements. 2015-08-10 17:08:03 +02:00
Sarah
ed7b8949bb Adding SpinnerFiller and SpinnerRewards. 2015-08-10 17:04:47 +02:00
Sarah
2253a63e96 Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus 2015-08-10 16:43:05 +02:00
Sarah
c6beb122e3 Adding firework animations for spinner. 2015-08-10 16:42:43 +02:00
Mini-Chiss
ad8781fd84 Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus 2015-08-10 16:14:24 +02:00
Mini-Chiss
18d11f7d68 new enums 2015-08-10 16:13:17 +02:00
Sarah
65fc81a2aa improving animations again. 2015-08-10 15:33:00 +02:00
Sarah
5781009f4e Improving animations and some text. 2015-08-10 14:00:40 +02:00
Shaun Bennett
aa13bcf5c6 Bug fix! 2015-08-10 04:54:01 -05:00
Shaun Bennett
adb76b0681 Fix giving out gold 2015-08-10 04:51:46 -05:00
Shaun Bennett
8745884153 Various fixes 2015-08-10 04:51:11 -05:00
Shaun Bennett
b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-08-10 03:24:59 -05:00
Shaun Bennett
6f8d6f8a40 Move Bonus and Poll to core 2015-08-10 01:55:50 -05:00
Shaun Bennett
511cc76bef Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working) 2015-08-10 00:47:36 -05:00
Shaun Bennett
d20fe54010 Disable carl features when carl can't be found 2015-08-09 16:36:48 -05:00
Mysticate
f8a6a25b46 Various Fixes. 
• Merged w/ master
• Changed to William's method of Projectile limiting.
- Prevented TNT hitting Teammates
• Fixed gem count for Sniper
• Added gems for direct hits + TNT Thrown
• Removed assists counting for kills in 6 kill.
 2015-08-09 15:01:27 -04:00
Mysticate
d9a8830e75 Few changes 2015-08-09 14:34:55 -04:00
Sarah
8c66ef7f15 changing Hub items and adding Profile GUI. 2015-08-09 18:33:44 +02:00
Mini-Chiss
5a7de8ef3d hub fixes 2015-08-09 17:21:56 +02:00
Sarah
85c8e42f53 Finalizing and improving the Carl spinner and adding creeper explosion animations. 2015-08-09 15:00:54 +02:00
Mysticate
5298fa341e Removed the revolving thing. 2015-08-08 16:13:54 -04:00
Mini-Chiss
328c31de88 hub Update 
fixed bad gameid
 2015-08-08 13:47:09 +02:00
Shaun Bennett
4f6dfdb856 Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes 2015-08-08 06:35:25 -05:00
Mini-Chiss
eab7aa59f2 hub update! 2015-08-08 09:27:49 +02:00
Mini-Chiss
47cb98066d Hub fixes 2015-08-08 08:19:07 +02:00
Mini-Chiss
33c96f51ae fixed some stuff 2015-08-07 22:59:50 +02:00
Mini-Chiss
090c1f135d Merge branch 'SarahsAwesomeBugFixes' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
 2015-08-07 21:48:35 +02:00
Mini-Chiss
b22706e649 hub update part 1 2015-08-07 21:45:38 +02:00
Mysticate
a9350bfacd Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-07 11:58:53 -04:00
Jonathan Williams
e8c60e6e84 Added storage of pets in mysql. Going to have live while backend process is copying data over. 
Updated ServerTypePage to resolve clicking issues with solo/team pages.
 2015-08-07 02:22:13 -05:00
Sarah
181b778a9c Fixing some bugs and disallow MPS while disguised. 2015-08-07 07:39:40 +02:00
Morten
f37e25e9d7 Finish push for today <3 2015-08-07 07:03:15 +02:00
Morten
608e8bf693 For Sarah <3 2015-08-07 05:40:16 +02:00
Shaun Bennett
be18dc1bf5 Add experience rewards to reward manager 2015-08-06 21:41:56 -05:00
Shaun Bennett
6311ceaa0f Reward work for new Game reward rarity and setup for carl, work on carl spinner 2015-08-06 21:15:17 -05:00
Morten
1680b652db Added Hat layer skin 
Added Sneak animation

With love from Morten <3
 2015-08-07 03:10:17 +02:00
Shaun Bennett
44e30a0903 SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui 2015-08-06 15:34:56 -05:00
Shaun Bennett
c67f4fa7e6 Votifier fixes 2015-08-06 06:45:47 -05:00
Shaun Bennett
35d999d747 Remove some debug messages 2015-08-06 05:56:31 -05:00
Shaun Bennett
9e9f9862d0 Bonus bonus bonus! 2015-08-06 05:47:32 -05:00
Sarah
6a3d888f5b fix git 2015-08-06 08:44:16 +02:00
Sarah
16a8164030 Fixing last bugs and disabling coin bombs while diguised. 2015-08-06 08:42:09 +02:00
Shaun Bennett
4cad99eb76 Lots of bonus work, start adding Votifier plugin 2015-08-06 00:45:39 -05:00
Sarah
a15e8e1b95 Fixing more /disguise bugs. 2015-08-05 15:23:16 +02:00
Sarah
83da6b7a9a Improving the /disguise command even more. ;D 2015-08-05 13:32:05 +02:00
Mini-Chiss
cba1c3bcca disallowed negative stats completely 2015-08-05 09:03:22 +02:00
Sarah
e55557e1fd Improving the /disguise command. 2015-08-05 07:57:52 +02:00
Shaun Bennett
b33b0ac935 More bonus work 2015-08-04 04:00:51 -05:00
Mini-Chiss
2f571aed25 fixed bugs from my vel fixes, WHOOPS. normalisation :( 2015-08-03 18:19:31 +02:00
Jonathan Williams
a623cc16ce Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-03 09:37:12 -05:00
Mini-Chiss
e10d26dae1 reduced respawn time in OITQ 
removed respawn msg for short respawn times
 2015-08-03 16:18:59 +02:00
Mini-Chiss
ccdb859f11 lowered mythical change a little :) 2015-08-03 16:11:11 +02:00
Shaun Bennett
e200ddd777 Merge branch 'master' into Bonus 
# Conflicts:
#	Plugins/.idea/misc.xml
 2015-08-03 08:32:45 -05:00
Jonathan Williams
ab20d35917 Wipe personal server groups on restart of monitor. 
Cleanup of unused code.
 2015-08-03 08:08:51 -05:00
Mini-Chiss
7c028ae936 fixed skywars teams icon in MPS 2015-08-03 11:44:13 +02:00
Mini-Chiss
bb2e15c4fd made it so games can set another game as its 'kit source' so games can share kit unlocks 2015-08-03 11:38:16 +02:00
Mini-Chiss
a87b3a9284 fixed kits not sharing for team vers 2015-08-03 10:10:29 +02:00
Shaun Bennett
38cc318387 Update JOOQ, downcast BigInteger to Long in stats for now 2015-08-02 19:36:24 -05:00
Jonathan Williams
a2250ea343 Fix for blocking logins if redis can't add account cache. 2015-08-02 18:59:13 -05:00
Jonathan Williams
41189b9838 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-02 17:23:17 -05:00
Ty Sayers
70c1b883db Fix bug with NPC server shops not properly calling the central method used for intervening and auto-joining. Also add in base for team/solo separation for specific server groups. 2015-08-02 18:20:52 -04:00
Jonathan Williams
d3ba621e86 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-02 17:00:49 -05:00
libraryaddict
4fdd42c599 Mysticate's request: Add PacketPlayOutCamera 2015-08-03 01:51:15 +12:00
Shaun Bennett
06be7b2cdd Fix stats 2015-08-02 05:24:25 -05:00
Mini-Chiss
638406254b refactored a little so theres no data stored in the util 2015-08-02 12:07:00 +02:00
Mini-Chiss
afc41c8831 converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity 2015-08-02 11:50:26 +02:00
Mini-Chiss
ac4755a5a9 Fixed incorrect velocity 2015-08-02 11:24:34 +02:00
Mini-Chiss
7910170327 fixed achievemnt amount 2015-08-01 18:39:18 +02:00
Jonathan Williams
992c0fc36f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-01 01:12:24 -05:00
Jonathan Williams
d3c5d0cbe6 Only store account cache stuff for 6 hours. 
Update MOtd.
 2015-08-01 01:12:01 -05:00
Shaun Bennett
fd65f27f0f Fix some typos/formatting issues 2015-07-31 10:01:19 -05:00
Mini-Chiss
b2a567673c disabled sale msg 
added double gem weekend
 2015-07-31 09:53:52 +02:00
Mini-Chiss
8d7c42134b fixed mounts having nametags 2015-07-30 14:54:23 +02:00
Mini-Chiss
0cf333ec00 lowered win req 2015-07-30 14:12:17 +02:00
fooify
7c4786e7d2 Merge remote-tracking branch 'origin/master' into foo 2015-07-29 14:15:24 -07:00
fooify
5da23fa322 Merge branch 'foo' of http://Fooify@184.154.0.242:7990/scm/min/mineplex.git into foo 2015-07-29 14:13:07 -07:00
fooify
db5c5a9888 *crosses fingers* please work! 2015-07-29 14:12:52 -07:00
Mini-Chiss
97a144150b fixed an NPE that was causing games not to end in MS 2015-07-29 21:51:18 +02:00
fooify
389bf7a74c please work... 2015-07-29 10:55:03 -07:00
Mini-Chiss
862cdae14f team modes 2015-07-29 16:32:11 +02:00
Mini-Chiss
c9c3db70f3 Merge branch 'SSM2PlayerTeams' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-07-29 14:08:17 +02:00
Mini-Chiss
932fe197b4 Merge branch 'perm-changes' 
Conflicts:
	Plugins/.idea/encodings.xml
reverted it.
 2015-07-29 14:06:21 +02:00
Mini-Chiss
c3e07522b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-29 12:22:11 +02:00
Ben Sihota
5af68e5628 Fulfill Shaun's request 2015-07-28 23:55:27 -07:00
Jonathan Williams
10549601f8 Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master 
* commit 'd0a45461d07904f70b5e42dee391f69843fb3978':
  Fixed bug with direct hit
  Final tweaks. this is as good as it's goign to get! ;d
  Tweaks
  Fixed waller achievement thing
  Fixed waller kit bc I was stupid before ;c
  Added an exception for a map to make it night.
  Various improvements.
  Added an achievement, removed team one, touched up another. Swag.
 2015-07-29 00:15:41 -05:00
Aaron Brock
b5e8c0886e Stuff and things 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-07-28 17:38:26 -04:00
Ben Sihota
e4da4aa0ed Remove NPC commands 2015-07-28 10:14:25 -07:00
Christopher Jozsa
c2cb86087a Merge pull request #22 in MIN/mineplex from horus-bug-fixes to master 
* commit '02f1211ddb7688737dc66605c174167cce708d0e':
  Misc
  Fix numerous trello bugs
  Update IntelliJ builds
 2015-07-28 02:24:15 -05:00
Shaun Bennett
16bad71dcc 1.8 Updates 2015-07-27 20:26:37 -05:00
Shaun Bennett
da3500cc32 Merge remote-tracking branch 'remotes/origin/master' into MC_1.8 
# Conflicts:
#	Plugins/Libraries/craftbukkit.jar
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
#	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseLiving.java
#	Plugins/Mineplex.Core/src/mineplex/core/map/BlockMap.java
#	Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java
#	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
#	Plugins/Mineplex.Core/src/mineplex/core/serverConfig/ServerConfiguration.java
#	Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
 2015-07-27 19:39:18 -05:00
Mini-Chiss
0557e10257 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-27 15:53:57 +02:00
Mini-Chiss
0c4a7a847f fixed annoying color bug! 2015-07-27 15:53:39 +02:00
Ben Sihota
7d9fd61c8e Display changes 2015-07-26 22:31:40 -07:00
Ben Sihota
0b53bca385 Needed permission changes for Jr Developers (Pending approval) 2015-07-26 18:58:35 -07:00
Ben Sihota
47d410370d Merge branch 'horus-bug-fixes' 2015-07-26 18:20:39 -07:00
Ben Sihota
02f1211ddb Misc 2015-07-26 18:12:56 -07:00
Mini-Chiss
8fd3a3a838 Merge branch 'Myst_LOBBERS' 2015-07-26 18:31:55 +02:00
Mini-Chiss
e0b1567e54 Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS 2015-07-26 18:31:11 +02:00
Jonathan Williams
727427165f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-26 08:49:49 -07:00
Jonathan Williams
26ed7ebb94 Fixes to redis 
Fixes for stat handler.
 2015-07-26 08:49:35 -07:00
Mysticate
0fd59e9fdb Added an achievement, removed team one, touched up another. Swag. 2015-07-25 21:50:37 -04:00
Mini-Chiss
2b240f3dfa removed visdata debug 2015-07-25 17:16:20 +02:00
Mini-Chiss
9fa8c6ac45 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
 2015-07-25 10:48:06 +02:00
Jonathan Williams
6d367e3cee Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-25 01:38:54 -07:00
Jonathan Williams
d3fede790a Merge pull request #17 in MIN/mineplex from MinorTweaks to master 
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
  Fixed report link
  http://pastebin.com/BRhT7pZP
  Reverted things
  Reverted Trainee to Helper due to popular demand.
  LOTS of tweaks :D
  Cleaned up somethings (lib's request)
  I'm a dumbass
  Fixed a few achievements
  Changed mineplex.com/supporthub > mineplex.com/reports
 2015-07-25 03:37:28 -05:00
Jonathan Williams
a1ce1ed45d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-25 01:31:01 -07:00
Jonathan Williams
84be48f264 Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method. 
Added conversion of stats to new stat table via StatHandler.

Changed stats value from int to long.
 2015-07-25 01:30:50 -07:00
Mini-Chiss
59d14624c0 Merge branch 'Myst_LOBBERS' 2015-07-25 10:26:47 +02:00