c0cfdf9785
fixed windblade not recharging whilst jumping
2015-11-26 07:29:39 +00:00
e80c1097b5
corrected regions
2015-11-26 07:08:30 +00:00
0d43ffc7b2
fixessss
2015-11-26 06:54:49 +00:00
6de7b8a73e
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 01:46:43 -05:00
972a2d151a
simplified combat log npc title
2015-11-26 06:21:01 +00:00
f92849f796
that doesn't do what i thought it did
2015-11-26 05:32:59 +00:00
1e4b6b4d0f
fixed formatting error in clan tip
2015-11-26 05:30:13 +00:00
7da8b8e3bf
fix players hurting each other in safe zones
2015-11-26 05:29:35 +00:00
48ebfc219d
removed travel npcs from shops
2015-11-26 05:24:33 +00:00
389956240b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-26 00:20:41 -05:00
76d009e0de
Unstuck (Spawn) command
2015-11-26 05:18:18 +00:00
33cdd5400d
fixed some coloring issues
2015-11-26 04:32:41 +00:00
8f14c8beae
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
2015-11-25 23:26:29 -05:00
7a663b4f7b
Fix legendaries
2015-11-25 23:24:07 -05:00
8bd1f4b3c8
reduced hyper axe damage. OP as heck
2015-11-26 04:21:30 +00:00
abcee009dd
stuff
2015-11-26 04:07:33 +00:00
670afc17ef
clans chat is being weird
2015-11-26 03:26:15 +00:00
5230b25dfd
fixed suicide command (?)
2015-11-26 03:24:48 +00:00
4f275d79fa
fixed staff tags only displaying if player is in clan
2015-11-26 03:19:40 +00:00
5fb58b1dad
added suicide command
2015-11-26 03:17:05 +00:00
8a64a2f4ce
fixed world events spawning floating on grass and other boundless blocks
2015-11-26 03:06:27 +00:00
b43cf0b28a
got rid of enchanted effect on rare items
2015-11-26 03:00:59 +00:00
7e23f896ca
changes
2015-11-26 02:49:01 +00:00
a19ade0739
rain rain go away
2015-11-26 00:53:01 +00:00
c150ea6175
Potatoes and Tornadoes
2015-11-25 19:08:13 -05:00
cc75bafb4c
Bugs and thugs
2015-11-25 16:45:04 -05:00
c5211e0368
buuugs
2015-11-25 17:40:12 +00:00
9a8fba543d
auto-replanting trees
2015-11-25 17:03:48 +00:00
2adfef41ca
bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 )
2015-11-25 16:46:53 +00:00
7e9dc7968e
gear gui fixes and legendaries changes
2015-11-25 01:32:05 +00:00
3a6dab7224
stuff
2015-11-25 00:55:11 +00:00
3cb22c8cb7
uuid bug fixed finally!
2015-11-25 00:47:35 +00:00
aa52c1be27
custom item stuff
2015-11-25 00:14:34 +00:00
6220ce14fe
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-24 23:04:24 +00:00
98edd0a452
dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours
2015-11-24 23:03:19 +00:00
81c2d2a11f
*just pushing my current changes so that i can start fresh on recoding custom item serialization stuff*
2015-11-24 22:49:28 +00:00
31afe9f886
removed debug message from undead camp
2015-11-24 22:29:20 +00:00
57302221df
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-24 17:27:46 -05:00
cb7422b4fe
Re-enable world events
2015-11-24 17:27:35 -05:00
befe4d129d
formatted PlayerGear.java (to avoid further confusion)
2015-11-24 22:21:01 +00:00
459e1beeff
clans buggy fixers
2015-11-24 22:18:48 +00:00
8559a63887
Added all rank names to Clans name blacklist
2015-11-23 22:10:29 +00:00
3fa0beceb7
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-23 21:39:53 +00:00
ef7c26c04c
Clans changes
2015-11-23 15:57:13 -05:00
91067535db
changed getting started tutorial gold reward to be proper (5000 now)
2015-11-23 18:09:50 +00:00
175a6bc31a
cleaned up world event times stuff
2015-11-23 17:24:17 +00:00
9bae314278
fixed null pointer exception when interacting with a block when your clan home is null
2015-11-23 17:19:00 +00:00
6ca4d12d98
fixed potential nofall exploit with logout npc
2015-11-23 17:09:51 +00:00
ce2e616c74
fixed /skiptutorial bugs, removed safe log out command, fixed tutorial bugs, and much more i can't remember ;-;
2015-11-23 16:57:50 +00:00
da2c7d84a4
tutorial code cleanup. removed qa reset command
2015-11-23 11:19:23 +00:00
a551e89310
fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT
2015-11-23 09:44:35 +00:00
58ed9e586c
turned ClansTips into it's own miniplugin, as it doesn't fit as a subclass of Tutorial
2015-11-23 09:04:30 +00:00
47abbfbedf
implemented skip tutorial being permanent
2015-11-22 20:01:54 +00:00
2e047b54c2
removed stone weapons from loot
2015-11-22 11:54:38 +00:00
0cdee95b87
formatted some classes
2015-11-22 11:23:19 +00:00
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
fb04fac0f6
removed debug message
2015-11-20 18:31:14 +00:00
521aa8d965
fixed furnaces in undead camp
2015-11-20 09:14:57 +00:00
08f683aa98
gave Archers in undead camps the barbed arrows effect
2015-11-20 07:49:28 +00:00
c29fd242ca
Forgot to remove the unnecessary check
2015-11-19 14:46:01 -05:00
f47a61e38e
Use bounds for energy tracker messages aren't displayed multiple times
2015-11-19 14:44:03 -05:00
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
3820035762
Cleaning up duplicate code/small optimizations (untested)
2015-11-19 14:35:59 -05:00
b0c60fd1f4
sparkly rare items! woo. and fixed gold dropping waaayyy too much
2015-11-19 19:03:51 +00:00
7d8e1b517d
Fixed dropped gold stacking...
2015-11-19 08:56:07 +00:00
f262a22913
Fixed loot dropping in King of the Hill not dropping correct items/
2015-11-19 08:54:59 +00:00
6372dfd629
fixed ArithmeticException / 0 in ClansEnergyTracker.
2015-11-19 08:29:50 +00:00
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
eded09b1a9
fixed yet another bug with beds... argh it seems to be working fine now.
2015-11-18 21:02:39 +00:00
6f3693f804
more bug fixes
2015-11-18 19:32:20 +00:00
924504ac9f
fixed clans home NPE. also added GRASS to UtilItem's item property system.
2015-11-18 19:03:44 +00:00
16eecdd112
fixed clan energy alerts going off incorrectly
2015-11-18 17:30:45 +00:00
5c2569e822
revert certain permissions from being ALL or containing JR.DEV (that were used for testing)
2015-11-18 16:20:27 +00:00
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
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
cd0ce57691
replaced useless looping with just checking the rotation of the bed.
2015-11-18 09:58:06 +00:00
1ea87b8354
Fixed an NPE when destroying a Clan's Home
2015-11-18 09:37:32 +00:00
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
f5e12e5014
formatted ClansGame.java (separate commit because confusion otherwise)
2015-11-18 08:37:34 +00:00
77f234e5f5
Made energy warnings stay for longer
2015-11-18 08:32:48 +00:00
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
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
f79c282225
Clan energy warnings implemented. (not tested yet)
2015-11-18 07:39:00 +00:00
4f63d90bac
Only show player location for allies/self
2015-11-17 18:42:06 -05:00
01a57dde2f
Fix formatting of ally messages
2015-11-17 18:39:15 -05:00
52c55335fa
Add chunk to unclaim map
2015-11-17 18:33:21 -05:00
ab8f9cb992
Fix map color
2015-11-17 18:31:38 -05:00
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
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
c23b2f54f5
Removed arbitrary boundary around admin territories (Chiss' request)
2015-11-17 22:41:51 +00:00
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
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
6187b5e680
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-16 17:34:47 -05:00
c3cd0e3ad2
Fix chat formatting, open clan shop with /c
2015-11-16 17:31:24 -05:00
f95bec0f15
Fix up mapmanager, untested
2015-11-17 11:30:04 +13:00
a153ffdc38
Fix enchant tables opening the wrong gui
2015-11-16 17:29:25 -05:00
5b30cfb67e
Fix War Points bug
2015-11-16 17:27:56 -05:00
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
181642e200
give undead warriors stone swords.
2015-11-16 19:41:09 +00:00
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
2627aa9933
War/War Points Update
2015-11-16 14:37:32 -05:00
580ec27738
hmm getTitle() in FieldBlock returns null (presumably accidentally), and forgot to update getters with interfaces.
2015-11-15 21:03:48 +00:00
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
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
fff248ad86
king of the hill gold drop fix
2015-11-15 20:37:37 +00:00
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
10eb1bb9c9
enum change didn't commit in the last commit ugh
2015-11-15 19:57:16 +00:00
22ae67ba81
king of the hill changes. (renamed enum for it for ease of typing)
2015-11-15 19:57:00 +00:00
c247fe9317
World event prettification and fixes
2015-11-15 18:19:28 +00:00
1d8366487b
Fixed King of the Hill from not working at all, and some other tiny fixes
2015-11-15 14:33:29 +00:00
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
1398987ff7
Removed currently unused world event types.
2015-11-15 08:49:44 +00:00
321d840cfd
Throwing RuntimeException instead of legacy assert expression.
2015-11-15 08:28:57 +00:00
f90b137ccd
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-14 16:46:03 -05:00
e4981c7491
Undead camp finishing stuff
2015-11-14 20:30:37 +00:00
487f974951
Clan Gui updates and code cleanup
2015-11-13 23:53:34 -05:00
8a972075da
Formatted WorldEventManager (seperate commit for formatting so that confusion doesn't arise in future commits)
2015-11-13 21:19:50 +00:00
a0ac15dec5
Allowed Jr.Devs to start/clear world events.
2015-11-13 21:01:09 +00:00
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
010f30f064
Made the alpha login message only send one (forgot to save the task manager stuff)
2015-11-13 20:57:33 +00:00
8ba9a8f6c4
Fix border radius
2015-11-12 22:38:26 -05:00
40138b6914
1.8 fix
2015-11-12 22:35:56 -05:00
f3e94cc035
Map fix (probably broken?!)
2015-11-12 21:35:01 -05:00
bbc7bf770c
1.8 Fixes - Still doing map fix
2015-11-12 19:18:42 -05:00
994a9e3e43
Clans Gui Work, commiting so I can switch branches
2015-11-11 18:05:48 -05:00
1aef7fe0b9
bunch of fixes reported by qa in tutorials.
2015-11-09 20:46:38 +00:00
f1fbe086d3
oh how fun, even more constructor errors!
2015-11-09 20:29:52 +00:00
af6e28f14b
don't you worry Shaun, I gotcha back with fixing them constructor problems ;)
2015-11-09 20:29:27 +00:00
8850737f71
Fix constructor issues
2015-11-09 15:22:15 -05:00
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
610b5dbeb2
More work on gui
2015-11-09 14:39:52 -05:00
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
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
8f507c4b9c
typo
2015-11-09 08:29:51 +00:00
ffc389f9c7
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-07 19:58:12 -05:00
af1d91913b
Clans gui work
2015-11-07 19:58:03 -05:00
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
addde570bb
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-07 14:53:35 -05:00
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
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
1375623625
Added alpha messages.
2015-11-04 17:03:52 +00:00
3ff044fddb
Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips
2015-11-04 11:32:06 +00:00
8033b40011
made math in GearPage a tiny bit more understandable
2015-11-04 01:27:33 +00:00
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
a455804dce
some Tutorial code cleanup
2015-11-04 00:07:32 +00:00
4bf92ce0a0
gah why isn't this working?! git is annoying!!!
2015-11-03 23:47:35 +00:00
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
4794cc6924
Clans Gui
2015-11-02 20:41:08 -05:00
27c6ef4e9d
Success! Finished all events woohoo!
2015-11-02 10:16:13 +00:00
0bc8413430
test
2015-11-02 10:11:54 +00:00
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
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
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
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
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
401350e85d
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-10-29 13:14:33 -04:00
364d8b05af
Fix war invasion
2015-10-29 13:14:27 -04:00
66a4b148e1
Fixed put on armour task being inconsistent.
2015-10-29 13:44:11 +00:00
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
d0bfb2e2e9
Finishing touches with UtilItem. Lots of changes to tutorials, and added a PlayerEnterTerritory event.
2015-10-29 08:35:24 +00:00
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
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
8d5b6e6d90
Don't show weakling particles above players that are not alive. Also removed debug message.
2015-10-27 10:18:14 +00:00
1938bcf799
Fixed the "weakling" status not updating correctly.
2015-10-27 10:01:33 +00:00
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
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
c30ece9d8b
Improved SafeLog to use the title system and holograms! Also removed knockback for NPCS
2015-10-26 19:48:20 +00:00
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
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
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
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
cc2aae9726
Final touches to the gear gui, making it now completely finished. hooray!
2015-10-26 00:08:03 +00:00
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
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
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
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
fd1638a572
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-10-23 02:17:57 -04:00
5944b734be
More war fixes - still needs tweaking
2015-10-23 02:17:47 -04:00
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
18d998fc04
Fixed colors cutting out in the middle of the message in task information, moar fireworks!
2015-10-23 05:56:53 +01:00
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
bf406493e3
Fixed tutorial tasks that rely on territory entrances not working because formatting...
2015-10-21 20:14:35 +01:00
00a689ea03
War work
2015-10-21 14:48:27 -04:00
112f34c77f
Fixed NullPointerException when clicking outside of inventory GUI.
2015-10-21 08:10:53 +01:00
a5df50de92
On going map tutorials started and finished.
2015-10-21 06:55:06 +01:00
eb203131a7
Fixed import errors since I moved the getting started tutorial to a different package.
2015-10-21 06:19:23 +01:00
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
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
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
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
0a3f942575
Fix compile issue
2015-10-18 12:42:56 -04:00
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
523378aae7
Clans War updates
2015-10-17 22:55:21 -04:00
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
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
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -04:00
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
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
5bce1b5f2e
Fix merge issues, fix observer command
2015-10-01 22:57:39 -04:00
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
NewGarbo
Shaun Bennett
Shaun Bennett
libraryaddict
Ty Sayers