Commit Graph

5795 Commits

Author SHA1 Message Date
Cheese
4a70e4da90 more fixies 2015-11-21 10:34:08 +11:00
Cheese
4d128d9c7a fixed some skills and wierd hitbox error 2015-11-21 10:29:48 +11:00
Cheese
c7297a7a38 fixed invalid proxies exploding 2015-11-21 09:45:01 +11:00
Cheese
d5076b1c47 CTF fix 2015-11-21 09:41:02 +11:00
Cheese
e0885feea6 Merge branch 'master' into alex-ctf 2015-11-21 09:40:07 +11:00
Cheese
04be896ff6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-21 09:39:50 +11:00
Sarah
97471b0d9c Finalizing Game Tutorials. 2015-11-20 23:38:02 +01:00
Cheese
0bc64fec16 Proxy limit fixes 2015-11-21 09:28:15 +11:00
Thanos paravantis
473f0ebcc7 Add first work in progress version of Fishing Day challenge. 2015-11-20 23:27:32 +02:00
Cheese
cfc0aa7d05 reverted to size 2 ball 2015-11-21 08:20:02 +11:00
NewGarbo
17e62f1f5a Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-20 18:31:37 +00:00
NewGarbo
fb04fac0f6 removed debug message 2015-11-20 18:31:14 +00:00
Sarah
6f7d49b71b Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-20 19:04:51 +01:00
Sarah
2a4d20650a Saving for branch switching. 2015-11-20 19:04:11 +01:00
Thanos paravantis
80c95f1995 Merge branch 'master' into thanos-mineware 2015-11-20 17:02:40 +02:00
AlexTheCoder
386032a4f5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 06:03:30 -05:00
AlexTheCoder
f51358552a -B 2015-11-20 05:57:29 -05:00
NewGarbo
521aa8d965 fixed furnaces in undead camp 2015-11-20 09:14:57 +00:00
NewGarbo
08f683aa98 gave Archers in undead camps the barbed arrows effect 2015-11-20 07:49:28 +00:00
Cheese
3067d9f281 final push for the day 2015-11-20 15:22:43 +11:00
Jonathan Williams
700e4c9a1f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-19 22:12:08 -06:00
Jonathan Williams
411d6fdb22 Made PlayerTracker use existing code for determining region. 2015-11-19 22:11:45 -06:00
Cheese
ed2f3a064c MORE ML! 2015-11-20 14:31:01 +11:00
Mysticate
3f37b893d3 Worked on double. 2015-11-19 20:29:20 -05:00
Cheese
3a5ab3f17c Merge branch 'master' into monster-league 2015-11-20 11:51:07 +11:00
Cheese
1cc92cea1b and the files 2015-11-20 11:50:33 +11:00
Cheese
c4745c18b6 ML update 2015-11-20 11:50:20 +11:00
Mysticate
f7011032bc Switching branches 2015-11-19 19:49:46 -05:00
Mysticate
f02e2b2e72 Formatting 2015-11-19 18:02:07 -05:00
Mysticate
e816a79f37 Reformatted 2015-11-19 17:51:25 -05:00
Mysticate
502f12f00f Fixed paintball to the max. :>> 2015-11-19 17:46:07 -05:00
Cheese
e14f5a36bd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-20 08:34:19 +11:00
Cheese
f33eedf36d text fix 2015-11-20 08:33:51 +11:00
Sarah
0fedb99660 Changing the tutorial visuals and texts. 2015-11-19 21:04:50 +01:00
Shaun Bennett
c29fd242ca Forgot to remove the unnecessary check 2015-11-19 14:46:01 -05:00
Shaun Bennett
f47a61e38e Use bounds for energy tracker messages aren't displayed multiple times 2015-11-19 14:44:03 -05:00
Shaun Bennett
63e580404c Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
2015-11-19 14:36:08 -05:00
Shaun Bennett
3820035762 Cleaning up duplicate code/small optimizations (untested) 2015-11-19 14:35:59 -05:00
NewGarbo
b0c60fd1f4 sparkly rare items! woo. and fixed gold dropping waaayyy too much 2015-11-19 19:03:51 +00:00
NewGarbo
7d8e1b517d Fixed dropped gold stacking... 2015-11-19 08:56:07 +00:00
NewGarbo
f262a22913 Fixed loot dropping in King of the Hill not dropping correct items/ 2015-11-19 08:54:59 +00:00
NewGarbo
6372dfd629 fixed ArithmeticException / 0 in ClansEnergyTracker. 2015-11-19 08:29:50 +00:00
fooify
6d0879a175 Re-fixed Barbarian bug 2015-11-18 17:31:28 -08:00
NewGarbo
0a667afeb1 finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching 2015-11-18 22:27:01 +00:00
William Burns
4620a5a162 Hub fix 2015-11-18 21:47:52 +00:00
Sarah
a8ba1f1ea6 some perspektive changes to the tutorial and removing prepare timer. 2015-11-18 22:33:47 +01:00
NewGarbo
eded09b1a9 fixed yet another bug with beds... argh it seems to be working fine now. 2015-11-18 21:02:39 +00:00
NewGarbo
6f3693f804 more bug fixes 2015-11-18 19:32:20 +00:00
NewGarbo
924504ac9f fixed clans home NPE. also added GRASS to UtilItem's item property system. 2015-11-18 19:03:44 +00:00
William Burns
6fa2a58f5d Merge branches 'master' and 'william-global' of ssh://184.154.0.242:25565/min/mineplex into william-global 2015-11-18 18:50:09 +00:00
William Burns
0e1c72e25d testing excludes 2015-11-18 18:46:51 +00:00
Sarah
f2830e653e Making last changes to the tutorial 2015-11-18 19:25:12 +01:00
NewGarbo
16eecdd112 fixed clan energy alerts going off incorrectly 2015-11-18 17:30:45 +00:00
Sarah
bff9a065d9 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-11-18 18:08:51 +01:00
Sarah
64970ab8d6 adding little tutorial at the start of the game. 2015-11-18 17:53:35 +01:00
NewGarbo
5c2569e822 revert certain permissions from being ALL or containing JR.DEV (that were used for testing) 2015-11-18 16:20:27 +00:00
Shaun Bennett
1eff698a34 Merge pull request #75 in MIN/mineplex from william-global to master
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
  ranks
  woops easy fix
  rawr and fixes
  Added the ability to give out game loot.
  Reformatting titles
  Added GlobalGiveCoins. Changes Gems a little and the manager.
  More global stuff! Added GlobalGiveGems.
  Global Packet work. Added giveitem sub-command.
2015-11-18 10:15:33 -06:00
William Burns
a11ca138e7 ranks 2015-11-18 16:01:53 +00:00
William Burns
04a4b072af woops easy fix 2015-11-18 15:48:25 +00:00
William Burns
2e223d0660 rawr and fixes 2015-11-18 15:42:33 +00:00
William Burns
e16ee9036a Added the ability to give out game loot. 2015-11-18 14:35:40 +00:00
William Burns
e83b49d490 Reformatting titles 2015-11-18 13:43:22 +00:00
NewGarbo
5c383a1df3 cleaned up /sethome old bed removal, as previous way would delete any beds around the home bed, which would destroy 2015-11-18 12:24:28 +00:00
NewGarbo
9eaffc8acf Added methods into UtilBlock to place beds and doors. updated /sethome to use the new method for placing beds. i'm sure they'll come in handy later on. 2015-11-18 12:17:00 +00:00
NewGarbo
cd0ce57691 replaced useless looping with just checking the rotation of the bed. 2015-11-18 09:58:06 +00:00
NewGarbo
1ea87b8354 Fixed an NPE when destroying a Clan's Home 2015-11-18 09:37:32 +00:00
NewGarbo
03764ad480 removed the disallowing of interaction in ClansGame.java if the block that the player is hitting, is a Clan's Home. This was messing up the other code for Clan Home bed stuff. 2015-11-18 08:40:24 +00:00
NewGarbo
f5e12e5014 formatted ClansGame.java (separate commit because confusion otherwise) 2015-11-18 08:37:34 +00:00
NewGarbo
77f234e5f5 Made energy warnings stay for longer 2015-11-18 08:32:48 +00:00
NewGarbo
185f19fb6a fixed clan energy warnings being sent to all players on the server instead of the clan. 2015-11-18 08:13:13 +00:00
NewGarbo
6da628abe1 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-18 07:40:35 +00:00
NewGarbo
f79c282225 Clan energy warnings implemented. (not tested yet) 2015-11-18 07:39:00 +00:00
fooify
4198e73120 Fixed SG Barbarian bug 2015-11-17 16:05:49 -08:00
Shaun Bennett
4f63d90bac Only show player location for allies/self 2015-11-17 18:42:06 -05:00
Shaun Bennett
01a57dde2f Fix formatting of ally messages 2015-11-17 18:39:15 -05:00
Shaun Bennett
52c55335fa Add chunk to unclaim map 2015-11-17 18:33:21 -05:00
Shaun Bennett
ab8f9cb992 Fix map color 2015-11-17 18:31:38 -05:00
Shaun Bennett
4183f0ce07 Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
2015-11-17 18:05:17 -05:00
Shaun Bennett
f6cfc36e9f War Invasion, GUI Improvements, New ClanRelation for Winning/Losing War, Update Clan Map for new relation, Show invasions in scoreboard 2015-11-17 17:59:35 -05:00
NewGarbo
c23b2f54f5 Removed arbitrary boundary around admin territories (Chiss' request) 2015-11-17 22:41:51 +00:00
NewGarbo
9b866145ea Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-17 22:24:58 +00:00
NewGarbo
31906b025f Clans Home switched over to using physical beds.
Changed "You cannot [break/place/use] [blocks/items] in [territory]" to something more simple (as per Chiss' request)
2015-11-17 22:24:19 +00:00
William Burns
e19d4e11e1 Added GlobalGiveCoins. Changes Gems a little and the manager. 2015-11-17 18:54:39 +00:00
William Burns
a28adc9673 More global stuff! Added GlobalGiveGems. 2015-11-17 18:26:19 +00:00
Mysticate
1342a8ac9f Class 2015-11-17 11:38:15 -05:00
Mysticate
448dd33c1a Switching branches c: 2015-11-17 11:38:02 -05:00
William Burns
0f7c52391f Global Packet work. Added giveitem sub-command. 2015-11-17 08:19:36 +00:00
Shaun Bennett
6187b5e680 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-16 17:34:47 -05:00
Shaun Bennett
c3cd0e3ad2 Fix chat formatting, open clan shop with /c 2015-11-16 17:31:24 -05:00
libraryaddict
f95bec0f15 Fix up mapmanager, untested 2015-11-17 11:30:04 +13:00
Shaun Bennett
a153ffdc38 Fix enchant tables opening the wrong gui 2015-11-16 17:29:25 -05:00
Shaun Bennett
5b30cfb67e Fix War Points bug 2015-11-16 17:27:56 -05:00
Cheese
adfc2f19eb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-17 09:20:15 +11:00
Cheese
46505a8e8e converted to new res pack locations 2015-11-17 09:19:33 +11:00
Shaun Bennett
007d5a00dc Merge remote-tracking branch 'origin/master' 2015-11-16 16:39:43 -05:00
Shaun Bennett
e35eec4cb1 Update motdmanager and compiler.xml 2015-11-16 16:39:34 -05:00
libraryaddict
208d90c4bc Fixed getTargetBlock being 0 when its infinite 2015-11-17 10:18:42 +13:00
NewGarbo
0d372cefaa Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-16 19:41:46 +00:00
NewGarbo
181642e200 give undead warriors stone swords. 2015-11-16 19:41:09 +00:00
Shaun Bennett
07f92d2e6e Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
2015-11-16 14:39:47 -05:00
Shaun Bennett
2627aa9933 War/War Points Update 2015-11-16 14:37:32 -05:00
Jonathan Williams
88dbe261db Added logging for stacker. 2015-11-15 18:34:35 -06:00
Jonathan Williams
ac792dcd02 Removed some unnecessary code in updateRank and opened up all ranks to be used. 2015-11-15 18:33:43 -06:00
AlexTheCoder
217509b75a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Conflicts Resolved
2015-11-15 18:58:20 -05:00
libraryaddict
e5b376bc5c Fixed wrong CB 2015-11-16 12:48:26 +13:00
AlexTheCoder
667edc8a90 Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-15 17:48:16 -05:00
AlexTheCoder
ecaa4a49b4 - Fix for stats 2015-11-15 17:48:00 -05:00
NewGarbo
580ec27738 hmm getTitle() in FieldBlock returns null (presumably accidentally), and forgot to update getters with interfaces. 2015-11-15 21:03:48 +00:00
NewGarbo
c6f73d6e9a oh deary me, i appear to have gone on a rampage of changing everything to interfaces. 2015-11-15 21:01:27 +00:00
NewGarbo
24dee0ebf6 updated ScoreboardElement to use the interface instead of the implementation. PLEASE NEVER USE THE IMPLEMENTATION FOR DEFINING THE TYPE!!! 2015-11-15 20:52:45 +00:00
NewGarbo
fff248ad86 king of the hill gold drop fix 2015-11-15 20:37:37 +00:00
NewGarbo
5209cf3d38 fixed an annoying IllegalArgument with the World Event start command. fixed limit bukkit runnable not limiting itself. 2015-11-15 20:04:44 +00:00
NewGarbo
10eb1bb9c9 enum change didn't commit in the last commit ugh 2015-11-15 19:57:16 +00:00
NewGarbo
22ae67ba81 king of the hill changes. (renamed enum for it for ease of typing) 2015-11-15 19:57:00 +00:00
NewGarbo
c247fe9317 World event prettification and fixes 2015-11-15 18:19:28 +00:00
libraryaddict
aaf3705cc7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-16 06:57:09 +13:00
libraryaddict
6e55074211 Add entitydismountevent 2015-11-16 06:56:39 +13:00
Mysticate
399edbab29 Sniper work 2015-11-15 12:47:45 -05:00
NewGarbo
2aa7dd13c3 fixed NullPointerException 2015-11-15 15:05:18 +00:00
NewGarbo
1d8366487b Fixed King of the Hill from not working at all, and some other tiny fixes 2015-11-15 14:33:29 +00:00
NewGarbo
33d358ac6a Quick fix in EventTerrainFinder because of incorrect block checking.
Added a constant "GOLD_PER_TICK" in the King of the Hill code, because hardcoded numbers are no fun.
Commented out some strange useless code.

Renamed getTicks() to getTicksRunning() and _ticks to _ticksRunning.
2015-11-15 12:09:31 +00:00
NewGarbo
e28059848c New 1.7 leaves fix for UtilBlock#getHighest() 2015-11-15 08:51:59 +00:00
NewGarbo
1398987ff7 Removed currently unused world event types. 2015-11-15 08:49:44 +00:00
NewGarbo
321d840cfd Throwing RuntimeException instead of legacy assert expression. 2015-11-15 08:28:57 +00:00
fooify
5767d4e2db SSM bug fix: magma cube flame dash doesn't make player invisible 2015-11-14 16:08:14 -08:00
Shaun Bennett
f90b137ccd Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-14 16:46:03 -05:00
NewGarbo
e4981c7491 Undead camp finishing stuff 2015-11-14 20:30:37 +00:00
Mysticate
746aab7786 Merge remote-tracking branch 'origin/master' into Myst_KITS
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java
2015-11-14 14:50:48 -05:00
fooify
db21d627d8 Merge remote-tracking branch 'origin/master' into foo 2015-11-14 09:13:51 -08:00
Morten
0a907fb661 Final stable version reached. All challenges work as intented.
Now I will start working on the scoreboard and possibly some kits?
Thanos will continue with some challenge creations. But we are approaching
the final version of Mineware
2015-11-14 15:01:04 +01:00
Thanos paravantis
b4f9899fb1 Rename Block Runner to Build Race. Final changes on Treasure Digger map creation. 2015-11-14 16:00:51 +02:00
Thanos paravantis
c2c99c1d5d Add additional checks for spectators on challenge events. 2015-11-14 14:31:46 +02:00
Thanos paravantis
3f4955de0d Fix carrot item not being added to player inventory on Fast Food challenge. 2015-11-14 13:58:23 +02:00
Thanos paravantis
ecbc3f3b5d Add additional check on Treasure Digger while placing decorations on the map. 2015-11-14 11:37:31 +02:00
Thanos paravantis
5ca96b5614 Update Treasure Digger, improved chest loot and map creation. Code refactoring on several challenges. 2015-11-14 11:23:25 +02:00
Jonathan Williams
daee44d262 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-14 02:01:24 -06:00
Shaun Bennett
9f37e3e595 Merge remote-tracking branch 'origin/master' 2015-11-14 01:46:44 -05:00
Shaun Bennett
2bb82da735 Motd update 2015-11-14 01:45:55 -05:00
Jonathan Williams
4a73bce586 Added gadget and projectileUser logging. 2015-11-14 00:36:34 -06:00
Shaun Bennett
487f974951 Clan Gui updates and code cleanup 2015-11-13 23:53:34 -05:00
Cheese
e7b86b4462 hub skytext 2015-11-14 13:05:11 +11:00
Cheese
60a6a81587 faster cleanup 2015-11-14 13:03:41 +11:00
Cheese
9518b64e3c clean up snowballs 2015-11-14 12:55:43 +11:00
Cheese
259397b6ae READY 2 GO 2015-11-14 12:52:14 +11:00
fooify
f9f4c2addc fixed several smash bugs and one global issue 2015-11-13 17:28:25 -08:00
Cheese
770e2be44b Merge branch 'master' into alex-ctf
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
2015-11-14 11:07:44 +11:00
Cheese
5586132429 champions balance 2015-11-14 11:05:51 +11:00
Thanos paravantis
f242919759 Update Treasure Digger (previously Evolution of Combat). 2015-11-13 23:54:17 +02:00
NewGarbo
8a972075da Formatted WorldEventManager (seperate commit for formatting so that confusion doesn't arise in future commits) 2015-11-13 21:19:50 +00:00
NewGarbo
a0ac15dec5 Allowed Jr.Devs to start/clear world events. 2015-11-13 21:01:09 +00:00
NewGarbo
98be3a51a0 Added a Speed I effect to the UndeadWarrior and UndeadArcher creatures that spawn in the UndeadCamp world event. 2015-11-13 21:00:08 +00:00
NewGarbo
010f30f064 Made the alpha login message only send one (forgot to save the task manager stuff) 2015-11-13 20:57:33 +00:00
Shaun Bennett
8ba9a8f6c4 Fix border radius 2015-11-12 22:38:26 -05:00
Shaun Bennett
40138b6914 1.8 fix 2015-11-12 22:35:56 -05:00
Shaun Bennett
f3e94cc035 Map fix (probably broken?!) 2015-11-12 21:35:01 -05:00
AlexTheCoder
016e54977d - Finish game [FINALLY] 2015-11-12 21:16:58 -05:00
Cheese
9de3981dec ms update 2015-11-13 11:24:11 +11:00
fooify
a0c0f6b891 Slightly bumped Monster Maze jump time value 2015-11-12 16:19:33 -08:00
Shaun Bennett
bbc7bf770c 1.8 Fixes - Still doing map fix 2015-11-12 19:18:42 -05:00
Shaun Bennett
639d2d110f Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-12 17:55:33 -05:00
Shaun Bennett
c4e188296a Fix compiler and misc 2015-11-12 17:55:00 -05:00
Shaun Bennett
0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""
This reverts commit 6c17b2926c.
2015-11-12 17:51:13 -05:00
Cheese
3122397f7a Merge branch 'master' into minestrike-update
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
2015-11-13 09:19:44 +11:00
Shaun Bennett
6c17b2926c Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
2015-11-12 16:35:31 -05:00
Sarah
4958ce347d Fixing boss not despawning bug, scoreboard end bug and some achievements. 2015-11-12 18:41:40 +01:00
AlexTheCoder
bc1b185f0e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-12 02:44:54 -05:00
AlexTheCoder
a8b27e66d1 - Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit
- Fixed items ever being lost from treasurechests
2015-11-12 00:06:21 -05:00
fooify
ac4a276aff fixed bridge bug "Death Bomber counts suicides as well" 2015-11-11 20:38:36 -08:00
fooify
8a0906587d Merge remote-tracking branch 'origin/master' into foo 2015-11-11 20:15:31 -08:00
Shaun Bennett
875c399c9f Merge branch 'master' into clans-beta 2015-11-11 21:31:03 -05:00
Shaun Bennett
33680e829a Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-11 21:25:32 -05:00
libraryaddict
25f299b490 Fix interact types 2015-11-12 14:34:12 +13:00
Shaun Bennett
e66bebcfb1 Give all treaure items when opening the chest 2015-11-11 18:13:47 -05:00
Shaun Bennett
994a9e3e43 Clans Gui Work, commiting so I can switch branches 2015-11-11 18:05:48 -05:00
NewGarbo
ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
	Plugins/Libraries/craftbukkit.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
2015-11-11 19:35:44 +00:00
Morten
e28878eec2 Quick update 2015-11-11 20:23:34 +01:00
libraryaddict
ba7515f761 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-12 04:27:17 +13:00
libraryaddict
b915131407 Fix some armorstands and interaction bugs 2015-11-12 04:26:55 +13:00
Thanos paravantis
1830d5eaa3 Update projectile manager usage on challenges. 2015-11-11 14:06:32 +02:00
Thanos paravantis
d93c2c7108 Merge branch 'master' into thanos-mineware
Conflicts:
	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java
2015-11-11 13:55:28 +02:00
Thanos paravantis
ba9d468619 Update Evolution of Combat challenge. 2015-11-11 13:49:35 +02:00
Jonathan Williams
27ef2c0bbb Fixed UtilEnt.Leash method. 2015-11-11 04:36:10 -06:00
Jonathan Williams
0e6146d5c9 Added expire to Stacker throw. 2015-11-11 04:32:56 -06:00
Cheese
3ed680e1c2 ms update 2015-11-11 15:55:48 +11:00
Cheese
ef2411b7d5 Merge branch 'master' into minestrike-update 2015-11-11 13:43:36 +11:00
libraryaddict
3e6d73221b Disabled a fix 2015-11-11 15:21:17 +13:00
Cheese
4dd9b0967a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-11 12:50:07 +11:00
Cheese
a47752cfe2 disabled usage of /minecraft: commands in 1..8 2015-11-11 12:49:19 +11:00
Cheese
d971e3c8a3 ms update 2015-11-11 12:46:58 +11:00
libraryaddict
ee286c2676 Disable /minecraft commands 2015-11-11 13:49:06 +13:00
libraryaddict
7559d1feb5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-11 11:45:40 +13:00
libraryaddict
f18c55cbd9 Fix schedulers 2015-11-11 11:45:17 +13:00
Cheese
e3c22b356b Merge branch 'master' into minestrike-update 2015-11-11 07:54:28 +11:00
Cheese
4eaa165826 such format 2015-11-11 07:54:13 +11:00
Cheese
59a054eeba fixed merge erorr 2015-11-11 07:52:02 +11:00
Cheese
520eb55b88 Merge branch 'master' into minestrike-update
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-11-11 07:43:50 +11:00
Cheese
b3125e40ff Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-11 07:43:01 +11:00
Morten
148a4e9425 Merge branch 'master' into MortensRawBugFixes 2015-11-10 17:16:00 +01:00
Morten
2ef32a14df Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
#	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java
2015-11-10 17:15:23 +01:00
Morten
2128a0d711 Updating to 1.8... sigh 2015-11-10 17:13:27 +01:00
fooify
394d680470 Merge remote-tracking branch 'origin/master' into monster-league 2015-11-10 07:09:19 -08:00
fooify
ca1177685f totally WIP commit 2015-11-10 07:08:08 -08:00
libraryaddict
6983af944f Fix a craftbukkit bug 2015-11-11 00:25:20 +13:00
libraryaddict
37fdf53a51 Fixed champion's Illusion crash 2015-11-11 00:21:28 +13:00
AlexTheCoder
d654f1f4b1 - Fixed class edit in lobbies
- Fixed conflict between rave suit and assassin
2015-11-10 06:17:25 -05:00
libraryaddict
1a2c163ce2 Fix scoreboard out of bounds error 2015-11-11 00:03:08 +13:00
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
Jonathan Williams
6e90052480 Updated StaffServer to 1.8 2015-11-10 02:01:39 -06:00
Cheese
0a9c97c32a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-10 18:05:01 +11:00
Shaun Bennett
2707173a8b Merge with 1.8 Branch 2015-11-10 01:48:33 -05:00
Cheese
83248a8fec Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-10 09:11:27 +11:00
Cheese
0ae5330634 squid changes 2015-11-10 09:11:10 +11:00
NewGarbo
1aef7fe0b9 bunch of fixes reported by qa in tutorials. 2015-11-09 20:46:38 +00:00
NewGarbo
f1fbe086d3 oh how fun, even more constructor errors! 2015-11-09 20:29:52 +00:00
NewGarbo
af6e28f14b don't you worry Shaun, I gotcha back with fixing them constructor problems ;) 2015-11-09 20:29:27 +00:00
NewGarbo
c6ff845efa arcade weird thingy 2015-11-09 20:28:41 +00:00
Shaun Bennett
8850737f71 Fix constructor issues 2015-11-09 15:22:15 -05:00
Shaun Bennett
0bb3f8adb1 Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
#	Plugins/.idea/dataSources.xml
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2015-11-09 14:41:16 -05:00
Shaun Bennett
610b5dbeb2 More work on gui 2015-11-09 14:39:52 -05:00
Sarah
18ab3d0f5b Mob shrinking and some Word fixes. 2015-11-09 15:40:49 +01:00
Jonathan Williams
5c89124eb6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-09 03:25:02 -06:00
Jonathan Williams
ba7d5bbcdc Fixed Arcade! 2015-11-09 03:24:20 -06: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
NewGarbo
0409d7ffef Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-09 08:48:12 +00:00
NewGarbo
4232a5675f fixed bug with part 5 of the getting started tutorial (has to do with claiming events) 2015-11-09 08:45:34 +00:00
NewGarbo
8f507c4b9c typo 2015-11-09 08:29:51 +00: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
Shaun Bennett
2a7b272de3 Merge remote-tracking branch 'origin/master' 2015-11-09 01:55:36 -05: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
Jonathan Williams
ff936784d3 Remove debug code. 2015-11-08 17:27:00 -06:00
Jonathan Williams
e86623c8d0 Disabled TrickOrTreatManager to test for Lobby lockups. 2015-11-08 17:26:43 -06:00
Jonathan Williams
fd3ccf7ce0 Fix Bungee lobby balancer code. 2015-11-08 17:25:54 -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
libraryaddict
1999e09e69 Update CB 2015-11-09 02:44:16 +13:00
Morten
3b641d46bb Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-11-08 14:33:53 +01:00
Morten
1958fa9f5e quick save 2015-11-08 14:31:56 +01:00
libraryaddict
ce3af6cf9c Update cb.jar 2015-11-09 00:15:28 +13:00
AlexTheCoder
9e24a5005f - Completed CTF 2015-11-08 03:04:17 -05:00
AlexTheCoder
211298327f - Fixed banners, begun work on patterns 2015-11-08 02:42:31 -05: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
AlexTheCoder
fb7fcccf24 - Reverting back to banners 2015-11-08 01:01:18 -05:00
libraryaddict
e039f2249c Update cb 2015-11-08 18:02:36 +13: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
Shaun Bennett
3c82574386 Testing pushing/ignore this 2015-11-07 20:02:07 -05:00
Shaun Bennett
ffc389f9c7 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 19:58:12 -05:00
Shaun Bennett
af1d91913b Clans gui work 2015-11-07 19:58:03 -05:00
Cheese
cc2e5bc6e4 minestrike update! 2015-11-08 11:30:19 +11:00
NewGarbo
9a70d33b17 Fixed clans user directory being wrong on test servers (because a backslash ['\'] is not seperator for certain OS). Changed /gear command rank back to Admin, and added assassin armor to the gear GUI. 2015-11-07 20:26:43 +00: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
Morten
a905726544 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-11-07 16:44:00 +01:00
Morten
d4bd1d7f93 Added Chiss' suggestions and fixed up pretty much everything
This is a stable version, I just need Thanos to send me his
final changes on his games
2015-11-07 16:36:22 +01: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
libraryaddict
627ce08113 Add info on note particle 2015-11-07 21:35:26 +13:00
Shaun Bennett
e1f56a5d5a Merge remote-tracking branch 'origin/master' 2015-11-07 01:10:34 -05:00
Shaun Bennett
ec7600a4a2 Giveaway tweaks 2015-11-07 01:10:27 -05:00
Cheese
c922c3248c disabled trick or treat 2015-11-07 13:36:16 +11:00
Cheese
f4bf685e96 removed halloween hub
removed titan giveaway and pumpkins
2015-11-07 13:20:29 +11: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
Thanos paravantis
7009e46693 Several updates and bug fixes. Evolution of Combat rework (See ChallengeNewEvolutionOfCombat). 2015-11-06 20:25:38 +02:00
libraryaddict
d3d448ccfe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-07 04:47:37 +13: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
NewGarbo
7675b00999 Dominance event. Shaun will have to call the new events once he's done with Dominance. 2015-11-06 07:11:06 +00:00
Sarah
56966d690f Fixing random Creepers, adding giant is under Attack message, adding start message, small fixes 2015-11-05 22:56:07 +01: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
1375623625 Added alpha messages. 2015-11-04 17:03:52 +00:00
libraryaddict
77125b3a24 Don't re-set scoreboard lines 2015-11-05 01:10:08 +13:00
libraryaddict
31b4fbec15 Fix a null 2015-11-05 00:49:26 +13:00
libraryaddict
0352e52a68 Tentative beginnings of wider scoreboards 2015-11-05 00:42:45 +13:00
NewGarbo
3ff044fddb Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips 2015-11-04 11:32:06 +00:00
libraryaddict
a0676b7bcf Fix tnt in SG being usable during DM invul 2015-11-04 21:44:10 +13:00
Sarah
ee7006a3de Giant makes Sounds, lifted up Giant, randomize Minions by time played, changing spawn Items. 2015-11-04 07:17:15 +01:00
libraryaddict
21d10e4bec Fix typo 2015-11-04 19:15:06 +13:00
libraryaddict
b3f86ba638 Fixing bugs 2015-11-04 18:34:22 +13:00
NewGarbo
8033b40011 made math in GearPage a tiny bit more understandable 2015-11-04 01:27:33 +00:00
NewGarbo
ed1e394a84 removed an unused type and a bit more cleanup; getting ready to clean up GearPage, which is... *shudders* 2015-11-04 00:09:46 +00:00
NewGarbo
a455804dce some Tutorial code cleanup 2015-11-04 00:07:32 +00:00
NewGarbo
4bf92ce0a0 gah why isn't this working?! git is annoying!!! 2015-11-03 23:47:35 +00:00
NewGarbo
ecd3b0ef76 removed a multiple Mineplex.Core.Common import thingy in the core project or something. i dunno, it was causing errors so i fixed it, yay! 2015-11-03 22:06:23 +00:00
NewGarbo
b7bf4765c4 DANG YOU WILLIAM 2015-11-03 22:05:17 +00: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
c25b1969de More progress 2015-11-04 04:00:53 +13:00
libraryaddict
f66c85d5b0 When clearing or getting items from player inventory, get it from player crafting as well 2015-11-03 18:57:41 +13:00
AlexTheCoder
c518221f6b - Fix Merge Error 2015-11-02 22:14:48 -05:00
AlexTheCoder
c41d01e213 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-bugfixes
Conflicts:
	Plugins/Mineplex.StaffServer/.classpath
2015-11-02 22:09:18 -05:00
AlexTheCoder
89c9f19c69 - Fixed MPS Whitelist 2015-11-02 22:08:02 -05:00
libraryaddict
975ad9e6ea Update to master 2015-11-03 15:05:56 +13: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
libraryaddict
7496ed763a Fix wither and dead bodies bug 2015-11-03 14:41:34 +13:00
Shaun Bennett
4794cc6924 Clans Gui 2015-11-02 20:41:08 -05:00
libraryaddict
3f66e11b3d Add fence to non-full-solids 2015-11-03 12:39:13 +13: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
NewGarbo
27c6ef4e9d Success! Finished all events woohoo! 2015-11-02 10:16:13 +00:00
NewGarbo
0bc8413430 test 2015-11-02 10:11:54 +00:00
NewGarbo
74c0eac141 Bunch of fixes and new stuff:
Cleaned up code everywhere.
Added a ClanCreatedEvent (accidentally formatted ClansDataAccessLayer ooooops)
Removed the tutorialManager access from ClansManager, as it is unneeded now.

Added Lapis Lazuli block particles to Alligator's Tooth (Sammy's request.)

Fixed NPE in TutorialTask#onFinish(Player);
2015-11-02 08:04:38 +00:00
Jonathan Williams
55d028d706 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-01 22:09:58 -06:00
Jonathan Williams
3a0b8d75a2 Added new support member. 2015-11-01 22:09:50 -06:00
Jonathan Williams
18bdcbec62 Fixed some NPEs with TrickDialogue
Added debug messages for Tricks.

Cleanup of monster targets in HubManager.
2015-11-01 22:09:36 -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
Cheese
cdb0fcae75 modified hideme a little :) 2015-11-02 14:37:12 +11:00
Sarah
da6bf27c77 Staff with a higher rank can see lower rank and same ranked vanished staff. 2015-11-02 04:32:07 +01:00
Jonathan Williams
cb96124feb Added extra cleanup for FriendsGUI and AddFriendPage 2015-11-01 17:42:23 -06:00
Sarah
ebf5ad4a4e adding boss Mobs and changing win mechanic. 2015-11-01 22:32:25 +01:00
Sarah
7c42dc3483 fixinf random Freaks. 2015-11-01 18:33:19 +01: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
5c2ade8270 Updated staff list. 2015-10-31 14:55:34 -05:00
Jonathan Williams
f16eee220d Removed Debug messages. 2015-10-31 14:55:18 -05:00
Jonathan Williams
073321fb14 Refactored TrickOrTreat Stuff. 2015-10-31 14:45:42 -05:00
Sarah
71bb03420b Adding sounds to spells, removing kits, notifications to Titles, Mob sizes/standardization, nuke -> Zombie Smash, 10 secs delay to Zombie Smash, Firebomb improvements and Freaks. 2015-10-31 18:37:19 +01:00
Cheese
92a2c2ebaa fixed npe in kit npc creation 2015-10-31 19:55:58 +11: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
5d58c56c27 fixed kit bug 2015-10-31 18:31:13 +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
Shaun Bennett
71e49854db Add halloween hats 2015-10-31 02:10:15 -04:00
Mysticate
1a6617bce1 Changes. 2015-10-31 02:05:03 -04:00
libraryaddict
519dceb72e Doublejumping downwards is a no no 2015-10-31 19:02:58 +13: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
NewGarbo
878f7aeafd Potentially fixed the problem where your NPC skeleton sticks around after you log in, and attacks you. 2015-10-30 22:48:40 +00:00
NewGarbo
f54da4ee78 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-10-30 22:20:33 +00:00
NewGarbo
396ce75087 Bug fixes/Additions:
- Being able to kill clan mates/create mode players who combat log.
- Added a notice that the player was killed, when a player logs back in after being killed when combat logging.
- Fixed Fall Damage making a player unsafe in safe territories.
- Fixed Alligator's Tooth damage.
- Fixed Alligator's Tooth working in lava.
- Added a UtilFile to Mineplex.Core.Common, for all stuff files!
2015-10-30 22:13:19 +00:00
Thanos paravantis
5c2c5ab280 Fast Food: Core functionality, workspace update. 2015-10-30 20:56:04 +02:00
Thanos paravantis
3ae333a15e Setting up Fast Food Challenge. 2015-10-30 17:43:43 +02:00
Thanos paravantis
dca5e06eb9 Merge branch 'master' into thanos-mineware 2015-10-30 17:14:03 +02: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
libraryaddict
da0a99d662 Spawn facing fixes 2015-10-30 16:06:47 +13:00
libraryaddict
50edf557ab Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-30 15:57:36 +13:00
libraryaddict
388aa1611c Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate 2015-10-30 15:44:37 +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
401350e85d Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-10-29 13:14:33 -04:00
Shaun Bennett
364d8b05af Fix war invasion 2015-10-29 13:14:27 -04:00
Shaun Bennett
e2947718fe Remove code that wasnt meant to be commited 2015-10-29 13:10:10 -04:00
NewGarbo
66a4b148e1 Fixed put on armour task being inconsistent. 2015-10-29 13:44:11 +00:00
NewGarbo
0c5e34ad84 Finished the tutorial changes that I wanted to add. Added a few more events for shop stuff, to make the code a bit cleaner. Might continue the idea of more events in Clans. Added an optional argument to QAResetCommand which will allow you to reset to a specific task number. Quite useful when testing tasks that are one of the last ones! 2015-10-29 12:56:00 +00:00
libraryaddict
7fca42b0e0 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/turfforts/TurfForts.java
2015-10-29 21:41:59 +13:00
libraryaddict
14df456b3d Progres 2015-10-29 21:39:38 +13:00
NewGarbo
d0bfb2e2e9 Finishing touches with UtilItem. Lots of changes to tutorials, and added a PlayerEnterTerritory event. 2015-10-29 08:35:24 +00:00
Aaron Brock
acc915c34e Re-added my TurfForts patch, as well as fixed the "Game Changes to build time while spectating so you don't get your blocks" glitch. 2015-10-29 01:12:12 -04:00
Aaron Brock
8dd80094b4 Fixed a little boolean derp that stopped people from breaking blocks.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 1f0accd)
2015-10-28 23:26:18 -04:00
Aaron Brock
9df297fc11 Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 76e4dc6)
2015-10-28 23:25:56 -04:00
Mysticate
a707006558 Work. Deemed unsuitable due to an issue with the paintballs flying wide. 2015-10-28 21:42:41 -04:00
NewGarbo
a063da4cae Renamed some things to comply with standards. Also moved some of the bit flags around, and moved them into seperate parts. 2015-10-28 22:55:10 +00:00
NewGarbo
afadd61431 Added a few new item categories into UtilItem, and added the bitmasks to the materials belonging to said categories. Changed from using the 32bit int data type, to using the 64bit long data type, this should give me a bit more free space for more categories to put items in to, as I already ran out of space using a regular int. 2015-10-28 22:47:30 +00:00
AlexTheCoder
cf26541461 - More Bugfixes 2015-10-28 18:16:52 -04:00
NewGarbo
cffcf245e9 UtilItem.java overhaul, complete item attribute system added. 2015-10-28 22:14:08 +00:00
Mysticate
d0e49280a4 Added a sniper kit! :D 2015-10-28 13:34:03 -04:00
NewGarbo
8ce50d1fc7 Done most of the tutorial ghost mechanic, and also switched from using task's indexes for referencing the tasks, instead using names now. This should allow for much more flexibility, and adding/removing tasks will not be such a pain! (Having to switch all of the task indexes around for any code referencing tasks.) 2015-10-28 17:08:48 +00:00
NewGarbo
765fb4ce11 Created the ClansShopItem enumeration, which has every item that can be sold in shops, with their buy and sell prices. All shops have been updated to reference this enumeration to get the prices for items.
Made it so that players that are "weaklings" will be stripped of their weakling title, if the sell value of their inventory is greater than 2000 Gold.
This mechanic uses the ClansShopItem enumeration, and is the main reason why it was created, since all prices were normally hardcoded into the shop page classes.
2015-10-28 07:34:13 +00: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
NewGarbo
8d5b6e6d90 Don't show weakling particles above players that are not alive. Also removed debug message. 2015-10-27 10:18:14 +00:00
NewGarbo
1938bcf799 Fixed the "weakling" status not updating correctly. 2015-10-27 10:01:33 +00:00
NewGarbo
b4897e91fa Fixed bug where an NPC's hologram would still stick around after the NPC is killed, since death and regular removal over time are handled separately. 2015-10-27 08:56:41 +00:00
NewGarbo
234799e55e Fixed infinite recursion in AlligatorsTooth.
Fixed a NullPointer exception in the Gear UI when you don't select an item type and you continue on.
Made a way to visually see the task you are on in the getting started tutorial, by making it dark cyan.
2015-10-27 08:32:21 +00:00
AlexTheCoder
0ab3213b7b - Fixed permanent dwarf toss bug
- Fixed skills being active while player is editing class
2015-10-27 01:38:41 -04:00
AlexTheCoder
9d6a361602 - Fixed emerald jump for Relyh 2015-10-26 23:42:52 -04:00
NewGarbo
c30ece9d8b Improved SafeLog to use the title system and holograms! Also removed knockback for NPCS 2015-10-26 19:48:20 +00:00
Sarah
e3049fd22e performance update for Minions and reducing nuke particles. 2015-10-26 17:54:45 +01:00
NewGarbo
da058881f8 Some bug fixes in the gear ui, added the shine to rare item factory (I FORGOT TO COMMIT THE CLASS LAST COMMIT ARGH)
added alligators tooth particles & sound
added wind blade power feature
2015-10-26 15:37:44 +00:00
NewGarbo
eb350a79c3 Added RareItemFactory (will add shine when lib helps me with it) and other small little fixes. Added a way to specify the amount of items in a single line in GearPage, so that armor and weapon type listings look more aesthetically pleasing. 2015-10-26 12:21:33 +00:00
AlexTheCoder
7770fa0284 - Added system to ensure banned players are removed from the network 2015-10-26 07:09:01 -04:00
NewGarbo
63406e9ce1 Moved GearManager back to it's original package, and stopped using it in GearPage. Removed commented code from GearCommand, as the gui is now finished and it is not needed anymore. 2015-10-26 07:57:00 +00:00
NewGarbo
7eab57c5dd As per Chiss' request, made the gear ui go to next page when you choose an attribute. 2015-10-26 07:49:03 +00:00
AlexTheCoder
f5b4f28848 - Fixed achievements
- Various balance patches/audio changes
2015-10-26 00:25:33 -04:00
NewGarbo
cc2aae9726 Final touches to the gear gui, making it now completely finished. hooray! 2015-10-26 00:08:03 +00: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
f0e4416644 Fixed tnt bug (SG) 2015-10-25 10:52:56 -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
Thanos paravantis
0d406f1992 Evolution of Combat: Removed hunger, added 60 second peace time, several gameplay changes. 2015-10-25 13:45:35 +02:00
AlexTheCoder
57da1d195a - Resolved randomly using java 8 in this one plugin 2015-10-24 20:50:47 -04:00
AlexTheCoder
08fd1b5790 - Fixed MPS Whitelist for usernames with non-lowercase characters 2015-10-24 20:49:09 -04: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
NewGarbo
63bc492f2c Almost completely finished the /gear ui, still a few bugs and missing features, but it's getting there. Logging off now, don't want to lose code. 2015-10-24 20:36:53 +01:00
Shaun Bennett
0d56eefd44 Titan/Rewards adjustments 2015-10-24 13:40:17 -04:00
NewGarbo
089c4420b2 Lots of progress towards a /gear gui, not finished though. commiting now because I'm leaving and don't want to lose the code. 2015-10-24 07:16:13 +01:00
libraryaddict
e3c824c512 Fix minor skywars error 2015-10-24 13:32:55 +13:00
libraryaddict
4d2b359aad Fix wolf cub strike 2015-10-24 08:41:10 +13:00
libraryaddict
43cd0f86a9 Fix players unable to break blocks at spawn 2015-10-24 08:40:57 +13:00
libraryaddict
7f025ad029 Fix CustomExplosion 2015-10-24 08:40:43 +13:00
Shaun Bennett
40afcaf26b Global Packet Commands 2015-10-23 15:07:53 -04:00
NewGarbo
0c29805756 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-10-23 19:27:13 +01:00
NewGarbo
11b836da8b Added Join/Quit messages.
Removed periods from attribute descriptions.
Fixed legendary item lore having incorrect formatting.
2015-10-23 16:59:30 +01: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
libraryaddict
de9678a20f Modify Craftbukkit 2015-10-23 21:28:01 +13:00
AlexTheCoder
d51b23849a - Fixed bugs and added features 2015-10-23 03:24:01 -04: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
Cheese
d9d0254e46 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-23 17:30:59 +11:00
Shaun Bennett
fd1638a572 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-10-23 02:17:57 -04:00
Shaun Bennett
5944b734be More war fixes - still needs tweaking 2015-10-23 02:17:47 -04:00
Shaun Bennett
e3e7dd4694 Titan rewards from mythical chests 2015-10-23 02:08:31 -04:00
NewGarbo
4c381d41fe Fixed second tutorial task misspelling, and added the first tutorial, which is /c help, as I completely forgot about it in the first place. 2015-10-23 06:10:09 +01:00
NewGarbo
18d998fc04 Fixed colors cutting out in the middle of the message in task information, moar fireworks! 2015-10-23 05:56:53 +01:00
AlexTheCoder
9ceb4eee94 - Take will and QA's suggestion about making the gameplay modifier a proper feature 2015-10-23 00:48: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
91ddcdb149 - Testing setup 2015-10-23 00:25:38 -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
Thanos paravantis
fba3578e1e Merge branch 'master' into thanos-mineware 2015-10-22 17:19:28 +03:00
Thanos paravantis
c459ef94ed Updating with latest modifications, no other features added. 2015-10-22 17:16:48 +03:00
libraryaddict
ddb8d592f8 Remove all is1_8 checks 2015-10-22 18:37:14 +13:00
NewGarbo
825b519890 Finalization of tutorials, made my code more consistent, and renamed any parts of code that referred to tasks as parts refer to them as "tasks."
Removed unused imports, and other code cleanup stuff.

Renamed EndTutorialCommand to SkipTutorialCommand as the actual command is "/skiptutorial" instaed of "/endtutorial"
2015-10-21 21:50:46 +01:00
William Burns
e6bec41ca8 Fix "code too large" error. 2015-10-21 20:29:44 +01:00
NewGarbo
bf406493e3 Fixed tutorial tasks that rely on territory entrances not working because formatting... 2015-10-21 20:14:35 +01:00
libraryaddict
3cd803cda0 Update patch files and cb 2015-10-22 08:07:10 +13:00
Shaun Bennett
00a689ea03 War work 2015-10-21 14:48:27 -04:00
Thanos paravantis
f6df946ea9 Evolution of Combat: General bug fixes, improved hunger, added protection so players can't get off the island. 2015-10-21 18:05:18 +03:00
NewGarbo
112f34c77f Fixed NullPointerException when clicking outside of inventory GUI. 2015-10-21 08:10:53 +01:00
libraryaddict
5c010af8c4 Add updatehealth packet 2015-10-21 19:56:52 +13: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
a5df50de92 On going map tutorials started and finished. 2015-10-21 06:55:06 +01:00
NewGarbo
eb203131a7 Fixed import errors since I moved the getting started tutorial to a different package. 2015-10-21 06:19:23 +01:00
NewGarbo
bd5266251b Finalized the getting started tutorial.
Added the last 5 tasks, and added a nice big ending (fireworks)

Added an ugly fix to the QAResetCommand, which I am really unhappy about, but can't find any other way about it. It's only a test command though, so it'll be removed in the final releases.
2015-10-21 06:17:18 +01:00
NewGarbo
c6cf47ee4e I did not mean to commit that one line... Oh gosh that would have been bad... (addCoins onEnterTerritory). Was just for testing shops. 2015-10-21 04:36:47 +01: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
Cheese
768ef4eb97 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-21 13:00:16 +11:00
Thanos paravantis
1360988366 Evolution of Combat, implementing hunger damage when player is idle. 2015-10-20 22:39:11 +03:00
Sarah
6860f013d0 Fixing some spelling typos chat filtering and the scoreboard. 2015-10-20 19:23:58 +02:00
libraryaddict
8ceb69513a Update patches and cb.jar 2015-10-21 05:05:27 +13:00
libraryaddict
07f032a5d2 Fix wither pet making sounds, fixed worldtime. 2015-10-21 04:22:31 +13:00
Thanos paravantis
89953396b2 Evolution of Combat minor changes to the "first weapon crafted" title functionality. 2015-10-20 17:59:56 +03:00
Thanos paravantis
33baf90d51 New Mineware challenge, first version of Evolution of Combat. Still work in progress. 2015-10-20 17:38:47 +03:00
libraryaddict
ddd674e371 Packets implement Pcaket right 2015-10-20 17:19:46 +13:00
NewGarbo
a2278297de Created the base for tutorials, and created the getting started tutorial.
Have all the commands and most of the functionality in here now, but still need to do the scoreboard and some tweaking.
2015-10-19 17:16:48 +01: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
libraryaddict
5d671d3300 Fix borders 2015-10-20 04:37:42 +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
Sarah
b7b99687c8 decreasing nuke animation 2015-10-19 01:34:48 +02:00
Shaun Bennett
6d7f15cd6d Fix hub time after light flicker 2015-10-18 18:52:16 -04:00
Cheese
c7a5be9570 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-19 09:03:46 +11:00
libraryaddict
55f97ef984 More fixes, along with a fix for Block Hunt 2015-10-19 06:21:16 +13:00
Shaun Bennett
0a3f942575 Fix compile issue 2015-10-18 12:42:56 -04: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
AlexTheCoder
0094fa31f0 - Accidentally edited classpath - oops 2015-10-18 06:17:44 -04:00
AlexTheCoder
547c8ca726 - Bugfixes 2015-10-18 06:14:54 -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
Shaun Bennett
523378aae7 Clans War updates 2015-10-17 22:55:21 -04:00
Cheese
d901cfa12c buildies can join full 2015-10-18 10:54:34 +11:00
libraryaddict
6f91827d57 Vector to Vector3f, updated Maze to 1.8 2015-10-18 12:40:01 +13:00
Thanos paravantis
a247150b4c Removing debug information, minor improvements on Block Runner. 2015-10-17 13:00:53 +03:00
libraryaddict
02bf202d52 1.8 update 2015-10-17 13:21:03 +13:00
Thanos paravantis
e4a1d81d8d Pushing latest bug fixes, will make more improvements tomorrow on Block Runner. 2015-10-16 23:27:23 +03:00
Shaun Bennett
589c05f8c0 Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
2015-10-16 14:25:31 -04:00
Thanos paravantis
fde6617c6b Block Runner (renamed from Heavy Blocks) bug fixes. Added additional checks on the block place event. 2015-10-16 20:34:50 +03:00
Thanos paravantis
c5dcf5d45a Mineware Challenge Updates (see description below)
- Added Block Runner challenge, may apply changes.
- Minor updates to Anvil Dance and Falling Block challenges.
2015-10-16 19:34:09 +03: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
Cheese
41b6fdc74e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-16 21:47:35 +11:00
Cheese
32489388c6 removed bug fix that caused SG break 2015-10-16 21:47:22 +11: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
Jonathan Williams
172bd65c57 Monster Maze motd. 2015-10-16 04:22:54 -05: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
016cea15f3 Merge branch 'Myst_HALLOWEEN' 2015-10-16 15:01:59 +11:00
Mysticate
b8eb924ffa Fixed timing out. Yay. I'm done. G'night 2015-10-16 00:00:08 -04: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
Mysticate
f0a22d5c36 Fixed hammer throw 2015-10-15 23:02:51 -04:00
Mysticate
f0e0d41c42 Fixed two things. 2015-10-15 22:23:49 -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
Sarah
cd4b3054fa Fixing "Armor Stand" 2015-10-15 20:25:35 +02: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
Sarah
6f55a60de0 removing more 2 word words, adding not killable message at Firebomb. 2015-10-14 22:41:34 +02:00
Ty Sayers
98ec99cffc Fix bug where players could retrieve teleport items out of the Travel Hub shop and later use them in their inventory. Implement a safe zone region of one chunk around all administrative clans (excluding Wilderness), to prevent players from building/claiming next to admin clans. Disable pistons throughout the server to prevent griefing. Fix left-over merge issue with donation manager. 2015-10-14 16:06:34 -04:00
Thanos paravantis
5ed6988041 Updating 2015-10-14 18:35:44 +03:00
Thanos paravantis
dcb9ef675c test 2015-10-14 18:03:15 +03:00
Thanos paravantis
f1a2a74e11 Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-10-14 18:00:45 +03:00
Morten
1c1184d58e Changed up some suggestions after major test 2015-10-14 16:55:06 +02:00
Cheese
1c52bd4f64 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-14 14:34:51 +11:00
Cheese
86bad0be30 mods can check other players skills 2015-10-14 14:34:30 +11: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
1842eae7f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-13 23:22:58 +11: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
Jonathan Williams
a292fdb3c5 Added failsafe for ServerMonitor. 2015-10-12 22:26:24 -05: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
Cheese
3e5ac58ae9 helpers! 2015-10-13 11:23:00 +11:00
Cheese
37639a413c fixed skill stuff 2015-10-13 11:22:10 +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
Mysticate
be96842de5 Ultra 2015-10-12 17:02:34 -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
Morten
3c85079d6d Small fixed. Preparing updating. 2015-10-12 21:26:40 +02:00
Sarah
e969e1adeb pushing for Lib to check because of Holograms, also editing spell names, removing 2 word words and editing the sniper spell. 2015-10-12 21:25:59 +02: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
Morten
040f99f62a Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex 2015-10-12 16:00:20 +02:00
Morten
768fa2223b Added 7 new games (some ok, others scrapped) 2015-10-12 15:55:45 +02:00
AlexTheCoder
dceba51060 - Fix random blockhunt bug with mounts and infestor 2015-10-12 03:09:40 -04: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
3eb36a6581 Prevented farming 2015-10-11 22:43:21 -04: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
dda65b4c77 Fixed tnt exploding lobbies 2015-10-11 19:56:36 -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
Mysticate
606937d227 Fixed flashbang glitch 2015-10-11 09:42:36 -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
Mysticate
435e74225a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-10 23:35:33 -04:00
Mysticate
83d1e011fc Changes. 2015-10-10 23:33:54 -04: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
8b75664627 queued holiday transactions 2015-10-11 12:54:35 +11:00
Cheese
6860fa608a titan placeholder perks
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
Mysticate
72d943f51b Restored skills to pre-eula ultra 2015-10-10 16:20:28 -04:00
Mysticate
5a8e500ec0 Fixed another thing 2015-10-10 16:15:10 -04:00
Mysticate
5e7ddb968e Changes and bug fixes. 2015-10-10 15:54:18 -04:00
Sarah
65b0d68244 adding more mobs and hiding enemy mob name tags. 2015-10-10 16:56:21 +02:00
Cheese
da6b1316d3 removed pumpkins from MPS 2015-10-10 22:47:19 +11:00
Cheese
323842c693 fixed mods staying in flight 2015-10-10 19:36:38 +11:00
Cheese
6f14c75f70 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 19:28:26 +11:00
Cheese
6cf786eb8c Merge branch 'Myst_HALLOWEEN' 2015-10-10 19:28:08 +11:00
Cheese
1026a2ae22 fixed explosions 2015-10-10 19:27:54 +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
245a42c8e0 animation is sexi 2015-10-10 02:13:04 -04:00
Mysticate
30a9196430 Done with animation. 2015-10-10 01:43:31 -04:00
Mysticate
9a7357e484 Work 2015-10-10 01:00:49 -04:00
AlexTheCoder
88b4ac96e5 - Achievement stuff 2015-10-09 23:15:19 -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
1127764cc3 Secsi 2015-10-09 22:44:49 -04: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
Mysticate
90c685617d Animation 2015-10-09 22:14:01 -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
ed89f5f4cc anim example for myst 2015-10-10 10:46:12 +11:00
Cheese
43f38c18ee animation 2015-10-10 10:40:44 +11: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
Mysticate
ff1431b652 Fixed players glitching to chests before game starts. 2015-10-09 10:21:35 -04: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
Cheese
99fd88473b rank colors 2015-10-09 14:20:02 +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
Cheese
c03c8163c5 fixed exploision stuff 2015-10-09 14:01:58 +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
Cheese
41678eaf35 fixed scoreboard bug 2015-10-09 13:42:37 +11:00
Mysticate
1011c36c43 Fixed lobby being destroyed. 2015-10-08 22:41:45 -04:00
Mysticate
96f14f4fda Fixed kit item names. 2015-10-08 22:31:20 -04:00
Mysticate
3802d47a37 Made the thing bold. 2015-10-08 22:29:22 -04: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
2cace7419f Made Destructor sexi 2015-10-08 20:42:29 -04:00
Mysticate
92bab25a3f Fixed Gust void stealing. 2015-10-08 20:38:33 -04:00
Mysticate
b8597d7161 Paintball stats. 2015-10-08 20:37:26 -04:00
Mysticate
cdb9741438 Changed the SG icon in hub, fixed EULA breaking thing in Class Shop 2015-10-08 20:36:16 -04:00
Mysticate
97d6f8fb42 Fixed placing walls in water. 2015-10-08 19:10:19 -04:00
Mysticate
8f826f6e83 Fixed blocks falling into floor in Build. 2015-10-08 19:04:51 -04:00
Mysticate
30e3c56635 Fixed ground issues in BUILD. 2015-10-08 18:58:30 -04:00
Mysticate
46bf963d44 Fixes not being able to reload dropped guns w/ 0 ammo. 2015-10-08 18:56:23 -04:00
Mysticate
979e68dcc7 Fixed the Minestrike multiple grenades bug. 2015-10-08 18:41:40 -04:00
Sarah
f8528c9cff Fixing Nuke animation bugs. 2015-10-08 19:04:39 +02:00
Mysticate
ef62fb5adf Made it so that when played on an MPS, HH won't give items. Yay! 2015-10-07 22:57:30 -04: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
3c437925f1 halloween prep 2015-10-08 12:36:00 +11:00
Cheese
191392825f Merge branch 'Myst_EVO' 2015-10-08 12:07:21 +11: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
Mysticate
5378ece214 Fixed chicken being able to fly.. 2015-10-06 21:09:53 -04:00
Mysticate
a0d0590777 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-10-06 21:04:49 -04: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
Sarah
34a554584c Making mob spawn rate dynamical, removing kill message, lowering kill animation, editing Scoreboard and changing Nuke animation. 2015-10-06 17:45:38 +02: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
aa0e01727e Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes 2015-10-05 21:30:39 +03:00
Mysticate
643f47763e Improved consistency with the F5 message 2015-10-04 20:28:21 -04:00
Sarah
e5b69a85c2 Changing back from 2 disguises to one. 2015-10-05 02:27:37 +02:00
Mysticate
0de34c15ab NO more endercrystal go boom boom yay 2015-10-04 20:23:41 -04:00
Thanos paravantis
9c1ba5f3d1 Changes on bomb error messages after QA recommendations. 2015-10-04 21:23:50 +03:00
Jonathan Williams
0eeea58a01 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-04 11:50:20 -05:00
Jonathan Williams
9f1c4653f4 Fix for Customer support item command with the removal of item categories. 2015-10-04 11:48:16 -05:00
alexmack929
6c73b1a5ac Start moving i18n into master. 2015-10-04 15:24:58 +01: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
Thanos paravantis
026c596de2 Minestrike bug fixes and minor changes
- Added a right-click message tip when the player with a bomb tries to place by left clicking.
- Changes in one of the tip messages while in game lobby.
- Moltovs and Incendiaries were not triggered once thrown to the ground.
- Players were able to extinguish grenade fire with a knife.
- The bomb was able to be planted after a round was over.
- On sniper rifles, scope was not removed if the match was ended.
2015-10-04 13:22:12 +03:00
Jonathan Williams
f9ea325da1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-04 00:24:11 -05: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
Thanos paravantis
2504493ebc Fixed four super paintball bugs.
- Projectiles could paint wool in the waiting lobby.
- When players fell in the void, they didn't got killed.
- Players that were painted could take off their armor.
- Players that were painted could logout and the skeleton would still stay there.
2015-10-04 00:34:00 +03:00
Mysticate
a7ab0cd723 ADDED MORE KITS I'M DONE HOORAY LOVE ME @CHISS 2015-10-02 22:43:29 -04:00
Mysticate
c9ff420a79 Now chooses a different maze every game. 2015-10-02 20:43:57 -04: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
a110cd6d9c Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-10-02 13:58:06 -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
9c38e8039e Add clans to compiler 2015-10-01 22:59:42 -04:00
Shaun Bennett
5bce1b5f2e Fix merge issues, fix observer command 2015-10-01 22:57:39 -04:00
Shaun Bennett
8911617a0c Remove BungeeSigns again? 2015-10-01 14:01:36 -04:00
Mysticate
3f6490f14a Gave health on safe pad <<<<<3 2015-10-01 10:47:37 -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
Mysticate
4a023c4644 Tweaks - I THINK I'M DONE HOORAY 2015-09-30 21:21:29 -04:00
Mysticate
05b735ba40 Fixed jump system 2015-09-30 20:28:35 -04:00
Mysticate
c39806a4e3 Kewl stuff. Yay 2015-09-30 20:01:51 -04:00
Mysticate
09ef2d73ae Grammar <3 2015-09-30 19:45:29 -04:00
Shaun Bennett
b8cc967fb0 Merge remote-tracking branch 'origin/clans-beta' into clans-beta
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-30 19:32:33 -04:00
Mysticate
68c6ba595e Visual enhancements. 2015-09-30 19:31:36 -04:00
Mysticate
d089ffeb30 Added a firework when a mob gets rekt 2015-09-30 18:48:45 -04:00
Mysticate
250e9cff13 Fixed a possible NPE 2015-09-30 18:43:52 -04:00
Mysticate
a25e2c575d Peace of mind stuff. 2015-09-30 18:35:56 -04:00
libraryaddict
86cdd7a30e Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-10-01 04:39:26 +13:00
fooify
c3b2c10934 FINALLY FIXED THIS MONSTER MAZE BUG :D 2015-09-29 19:14:18 -07:00
Ty Sayers
d870ff6f11 Fix bug where Fissure could be exploited with Arctic Armour for 'water bending', allowing players to artificially create Water towers by bending temporary ice. 2015-09-29 18:47:24 -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
f8ef46abde Merge master code into clans 2015-09-28 21:41:05 -04:00
Mysticate
2d173a5be4 Fixed a jumper perk. 2015-09-28 21:03:58 -04:00
Shaun Bennett
14027b9780 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-09-28 21:03:00 -04:00
fooify
bcfd8fcec7 bug fixes:
- fixed bugs
- fixed more bugs
- after that, more bugs were fixed
2015-09-28 17:54:56 -07: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
Mysticate
00eecc0325 Fixes 2015-09-28 20:33:38 -04:00
fooify
3a10677b10 AI bug should be fixed, I need Mysticate to test though 2015-09-28 15:15:51 -07: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
AlexTheCoder
5a5dbcfe67 - Assorted bugfixes 2015-09-27 23:36:51 -04:00
Mysticate
00a8cf769b Swag 2015-09-27 14:55:37 -04:00
Mysticate
7e40d0d4bb Lots of cool stuff 2015-09-27 12:10:52 -04:00
Mysticate
eea7ef8350 Swag 2015-09-27 02:11:28 -04:00
Mysticate
54eca7fa9e Lots of work. 2015-09-26 23:18:05 -04:00
AlexTheCoder
cddc6674a5 - Fixed bug with Dwarf Toss 2015-09-26 19:22:17 -04: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
Jonathan Williams
1ad61a09e4 Should include the file with the change commit. 2015-09-26 18:30:45 -04:00
Jonathan Williams
0d8ef7fea3 Fixed lobby balancing technique.
Removed random UUID for bungee redis database.
Enabled bungee name in debug output for bungee rotator.
2015-09-26 18:25:29 -04:00
Mysticate
9350386361 Lots of things. :D 2015-09-26 15:08:43 -04:00
Sarah
c99851da37 finishing spells, kits and animations. 2015-09-26 14:31:17 +02:00
Mysticate
8e9a3e90a7 Merge branch 'monster-maze' of
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
2015-09-26 00:00:46 -04:00
Mysticate
30d2281785 Lots of things 2015-09-25 23:59:31 -04:00
fooify
1e018cf74a Improved Smasher 2015-09-25 20:21:06 -07:00
Mysticate
2de409c2f2 Made the mazes do things. 2015-09-25 20:14:46 -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
Mysticate
a0ec656bc1 Fixed another tracker. 2015-09-25 12:49:21 -04:00
Morten
e367391626 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-09-25 18:04:03 +02:00
Morten
1c995b14e8 Ignore this 2015-09-25 18:03:10 +02:00
Mysticate
b2f1f7d2ae Fixed the tracker for pilot. 2015-09-25 11:38:32 -04:00
Morten
59d1a949c4 Created an "END" event for challenges 2015-09-25 17:04:47 +02:00
Thanos paravantis
dbf5d627ca Merge branch 'master' into MortensRawBugFixes
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-09-25 17:37:58 +03:00
AlexTheCoder
1cc503bd3b - Added resupply points [requested] 2015-09-25 04:37:54 -04:00
AlexTheCoder
49908e7550 - Added game to hub text 2015-09-25 04:28:11 -04:00
AlexTheCoder
03d1d85388 - Testing improvements 2015-09-25 04:23:24 -04:00
AlexTheCoder
7c04e5608d - Added new achievement 'Clutch'
- Made new achievements needed for achievement skills
2015-09-25 04:17:20 -04:00
AlexTheCoder
218aa8c584 - Fixed all formatting 2015-09-25 03:52:34 -04:00
AlexTheCoder
f23ef8eea0 - Returned to temporary placeholder block system to prepare for 1.8 update 2015-09-25 03:41:29 -04:00
libraryaddict
88a48277c0 Flags, change to packets 2015-09-25 17:15:09 +12:00
AlexTheCoder
5f45e8c1d3 - Misc changes [increased game time, captures required] 2015-09-25 00:44:28 -04:00
libraryaddict
1394df03e0 For now, set all boss battles games to spider 2015-09-25 16:43:53 +12:00
AlexTheCoder
5b42d25bff - Added achievement and stat stuff
- Fixed banner bugs
2015-09-24 23:16:44 -04:00
Mysticate
e66d8765e7 Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze 2015-09-24 23:02:27 -04:00
Mysticate
60c4e5812a Fixed trackers 2015-09-24 23:02:19 -04:00
fooify
69ed764483 Added another maze. 2015-09-24 19:55:43 -07: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
2a77eda4fc Spider boss code 2015-09-25 14:08:47 +12:00
libraryaddict
69517a3dcb Refresh the name after custom stuff is done so it applies on disguises 2015-09-25 14:08:27 +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
libraryaddict
e8725b38ab Colorize the messages for when a /game start fails 2015-09-25 14:06:35 +12:00
Mysticate
a9f20a573c Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze 2015-09-24 21:10:31 -04:00
Mysticate
9a70d4997a Fix 2015-09-24 21:10:12 -04:00
Mysticate
d9b6d8f0e3 Changes 2015-09-24 21:01:18 -04: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
7445fda922 Made the thing a lot better. Yay! :D 2015-09-24 11:04:05 -04:00
fooify
4663aa3eaa updated mazes 2015-09-24 07:29:48 -07:00
Mysticate
5de016c077 Merge branch 'monster-maze' of
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 23:46:21 -04:00
Mysticate
842da3d6fb Tons of changes. 2015-09-23 23:44:10 -04:00
fooify
a301c87efc workstuffchanges on monster maze 2015-09-23 19:23:21 -07:00
Christopher Jozsa
9a3ef895c9 Merge pull request #38 in MIN/mineplex from mrsomeone12_SmallFixes to master
* commit '633cbdabe279a9ec1a57d96d6585f58a6d3754df':
  player.isOnGround() is controlled by packets from the player, meaning players can easily fake being on the ground resulting in infinite double jumps. player.getFallDisance() is also reset when isOnGround() returns true, meaning we'll need to manually check if the player is on the ground.
2015-09-23 19:37:48 -05:00
Sarah
0a42ab7aee Adding spell system, spells, and more kits. 2015-09-23 22:04:45 +02:00
Mysticate
125b823a65 Fixed achievement arcade page size. 2015-09-23 15:43:14 -04:00
Mysticate
71408fabd2 One thing. 2015-09-23 15:24:34 -04:00
Mysticate
81e780d400 Merge branch 'monster-maze' of
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MMMazes.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 15:23:08 -04:00
Mysticate
84331901d4 Added achievements and final polish. 2015-09-23 15:18:44 -04:00
AlexTheCoder
d5ef15cd6d - Trying to fix errors 2015-09-23 14:00:19 -04:00
AlexTheCoder
09e44d3372 - Fixed version stuff 2015-09-23 13:47:49 -04:00
AlexTheCoder
3ee6c5c7c8 - Fix Merge Error 2015-09-23 13:25:41 -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
AlexTheCoder
512714219b - Visual edits 2015-09-23 13:04:30 -04:00
fooify
0ad91a6b0b more changes! :D 2015-09-23 07:10:48 -07: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
Morten
7838ad2bce For Bisko to pull 2015-09-22 16:12:51 +02:00
Shaun Bennett
3ae043e7d8 Merge remote-tracking branch 'origin/master' 2015-09-22 01:38:52 -04:00
Shaun Bennett
cf618abd4e BotSpam Module 2015-09-22 01:38:45 -04:00
Cheese
4519f2dda1 Merge branch 'EventGameUpdates' 2015-09-22 14:59:17 +10:00
Shaun Bennett
86420132ce Clan name->uuid changes 2015-09-21 20:05:16 -04:00
fooify
1f84907309 more changes to monstermaze 2015-09-20 07:40:24 -07:00
AlexTheCoder
05f47be864 - Some fixes 2015-09-19 16:38:07 -04:00
Morten
a5398cb773 Added new challenges and fixed a lot of bugs. 2015-09-19 19:01:13 +02:00
AlexTheCoder
3a1acb9f37 - Code Cleanup
- Transitioning to banners fully
- Preparation to remove banner bugs
2015-09-19 00:41:23 -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
AlexTheCoder
52a5c63166 Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-09-18 20:08:43 -04:00
AlexTheCoder
d4b8cb253c - Edited messages as per owner request 2015-09-18 20:08:22 -04:00
libraryaddict
8015f5428d Flags stuff 2015-09-19 08:36:23 +12:00
fooify
0581474a16 lots of work on Monster Maze 2015-09-18 08:25:11 -07:00
Shaun Bennett
901dad2f8a Add vote3 to bonusmanager 2015-09-17 22:31:18 -04:00
Shaun Bennett
6a4c9061fa Supply drop, loot, small fixes 2015-09-17 22:19:45 -04:00
Cheese
aa30c866fd flurrry 2015-09-18 10:22:16 +10:00
libraryaddict
5e8fc77164 Add pages to spectator and in-progress server menu 2015-09-17 04:34:45 +12:00
AlexTheCoder
e6ecd2d5e1 - Fix for stolen message 2015-09-15 18:38:02 -04:00
Sarah
362d99a819 Fixing up Gem signs, Effects etc. 2015-09-15 07:10:39 +02:00
AlexTheCoder
6c5c2f4c4e - Added slowness to flag carriers and removed any active potion effects they had 2015-09-14 20:38:32 -04:00
AlexTheCoder
0035f3abb0 - Added requested flag location updating
- Added sudden death mode when the timer runs out and the game is tied, respawning is turned off and the first to capture a flag wins
2015-09-14 18:54:40 -04:00
AlexTheCoder
2018374b06 - Fixed a color bug 2015-09-14 18:53:10 -04:00
AlexTheCoder
abaf94618c - Increase flag respawn time
- Fix flag timer being black
2015-09-14 18:42:08 -04:00
libraryaddict
655283e008 Progress on spider 2015-09-14 23:23:12 +12:00
Cheese
ac269839c5 squid skill 2015-09-14 14:14:06 +10:00
Cheese
d9142ac33f smash balance 2015-09-14 12:34:55 +10:00
fooify
2de7fff267 Merge remote-tracking branch 'origin/master' into monster-maze 2015-09-13 08:45:34 -07:00
fooify
aa8cb8943e more work on monster maze 2015-09-13 08:42:26 -07:00
Sarah
7ca6f58108 Adding Gem signs. 2015-09-13 10:25:44 +02:00
Sarah
353c553589 Adding more Words, Removing some Minion types and changing Items in Hotbar. 2015-09-13 10:00:18 +02: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
Sarah
a46cb2c274 last fix in the listAreaInfo method. 2015-09-13 00:35:22 +02:00
Sarah
53d5c2fd0e adding area info command. 2015-09-13 00:30:55 +02:00
Sarah
112f94a842 forgot to add command to remove potion effects. 2015-09-13 00:00:47 +02:00
Sarah
fcec6253cd fixing @p on signs, adding potioneffects and gadgets to areas. 2015-09-12 23:56:38 +02:00
Sarah
b6ffee73f5 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates 2015-09-12 21:17:45 +02:00
fooify
55ac104e2c took forever to get it working, but the maze parsing works! :) 2015-09-12 09:50:06 -07:00
Jonathan Williams
1417d31b73 Added 60s delay to timings enable check. 2015-09-11 23:57:26 -07:00