TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-20 15:14:35 +00:00
Code Issues Projects Releases Wiki Activity
1952 commits 14 branches 0 tags 210 MiB
Commit graph

1613 commits

Author SHA1 Message Date
Benford
9a487adc35 Fix various bugs 
- Changed Airblast to compensate for AirBurst
- Fixed Lavaflow bugs (spam click and plants)
- Fixed being able to bend while using a fishing rod
- Added feature to IceWave: While the ability is progressing the ice
will thaw as the player gets farther away from the created ice sphere
- Added new options to config
 2016-04-03 14:38:42 -04:00
OmniCypher
4a1bc7b8c8 Merge pull request #467 from StrangeOne101/master 
Multiple Fixes
 2016-04-01 09:57:08 -07:00
OmniCypher
ddda2ecbf8 Adds BendingPlayerCreationEvent and moves login 
Moves login method to GeneralMethods and renames it to loadBendingPlayer
Fixes Prefix assigning in loadBendingPlayer
 2016-03-31 23:25:05 -07:00
StrangeOne101
8950aca2b3 Fix Heatcontrol not working in water 
• Fixes heatcontrol now thawing ice in liquids as well as other opaque
blocks
 2016-04-01 17:40:09 +13:00
StrangeOne101
4e5a268e4f Fixes for IceSpike 
• Fixed Flooding with Bottlebending
• Fixed IcePillar not working on single click
• Fixed IcePillars not working on packed ice
• Reduced sounds created by IcePillarField (it was painful)
 2016-03-31 21:20:36 +13:00
StrangeOne101
e16ccecf3f Fixes for OctopusForm 
• Fixed OctopusForm leaving smoke trails
• OctopusForm cooldown now applied when it starts forming, not when you
select a source
 2016-03-31 20:04:04 +13:00
OmniCypher
6d515fdf17 Merge pull request #464 from Simplicitee/master 
Move armor effects to PassiveHandler
 2016-03-29 22:38:50 -07:00
Benford
79edcc49d2 Move armor effects to PassiveHandler 2016-03-30 00:57:58 -04:00
StrangeOne101
1a482cf6dd Fix Bending in GriefPrevention Regions 
• Fixed bending being allowed in GP zones
 2016-03-30 13:54:15 +13:00
Benford
6ed6cb2375 Fix and Upgrade passive system 
- Fixed passives merging and becoming wonky
- Updated speed, exhaustion, and jump passives to use PassiveHandler
class.
- Added exhaustion passive to chi
 2016-03-29 01:46:39 -04:00
Benford
c4c12c45e8 Fix AirSwipe charged version 2016-03-28 23:53:21 -04:00
Benford
b251971e2f Remove testing messages 2016-03-28 23:06:55 -04:00
Benford
041a003ff1 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-28 23:04:31 -04:00
Benford
7510445733 Commit shockwave addition 2016-03-28 22:53:02 -04:00
Benford
af24a227a3 Fix armor issues 
- Also added return statement in shockwave
 2016-03-28 22:52:03 -04:00
jedk1
379270caec Add per combo config enable/disable option 2016-03-29 01:00:10 +01:00
OmniCypher
ad4c7aeffa Various Fixes 
Fixes FastSwimming on AirSpout slot
Fixes command consistency
Fixes bind command "ability does not exist" message
Fixes add command description
Fixes WaterArms move display
Fixes WaterArms Spear Ice Dome
 2016-03-28 15:26:47 -07:00
OmniCypher
e155f1712f Fixes part of PlantArmor and EarthRevert 2016-03-26 18:00:25 -07:00
OmniCypher
25bd8d7c8c Various Changes/Fixes 
Updates WorldGuard depend version
Fixes NPE in EarthAbility reverting
Fixes NPE in PKListener when getting element prefixes
Fixes inconsistencies between commands
Adds getPrefix() Method to Element
Adds Items commands to /b help
 2016-03-26 12:07:36 -07:00
Matt
ca383ff03f Fixed blocks not being returned to their previous state 2016-03-25 15:00:41 -05:00
Benford
1cd9f87f1d Updates 
- Updated tabbing for rpg commands
- Updated the help command to show rpg commands
 2016-03-23 20:30:00 -04:00
Matt
98fcb4f78f Fixed passives 2016-03-19 21:28:04 -05:00
jedk1
cfdc6ce0ee Fix shockwave cleanup 2016-03-19 18:31:57 +00:00
OmniCypher
d32b701f82 Merge pull request #450 from Simplicitee/master 
Fix passives in disabled world
 2016-03-16 19:26:36 -07:00
Benford
f82dce0464 Fix passives in disabled world 2016-03-16 22:12:09 -04:00
OmniCypher
d7c1002974 Merge pull request #449 from Simplicitee/master 
Fix table creation
 2016-03-16 18:41:45 -07:00
Benford
e2bd9a874a Fix table creation 
- Added missing comma
 2016-03-16 16:05:36 -04:00
StrangeOne101
0e99fbef4d Add Forgotten Changes 
• Just added some small things that were forgotten in the last commit
 2016-03-16 16:15:02 +13:00
StrangeOne101
3c216cebad Update Subelement Lingo 
• Updated all commands to treat subelements as elements in certain
circumstances (add, remove, etc)
• Updated tabbing with bug fixes
• Database will now update player's subs when they log in for the first
time (post update)
• Removed "SubElementAdded" field from config
• Fixed /b choose not taking aliases
 2016-03-14 22:07:33 +13:00
Benford
f273e2f734 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-13 15:33:04 -04:00
Benford
105dc8b005 Various changes 
- Changed BindChangeEvent call spot
- Changed subelements to be stored in database
- Changed choose command to accept subelements as an argument
- Changed add command to accept subelements as an argument
- Changed all canBend<SubElement> methods
- Added PlayerChangeSubElementEvent
- Added saveSubElements() method to GeneralMethods
- Cleaned up imports in various classes
- Removed print out in damagehandler
 2016-03-13 15:16:01 -04:00
OmniCypher
7832927cc3 Merge pull request #444 from FinnBueno/master 
Fixed flight disabling creative flight
 2016-03-10 18:46:31 -08:00
FinnBueno
63f6b420dc Fixed flight disabling creative flight 
Fixed flight disabling flying when the player is in creative or
spectator mode.
 2016-03-10 20:08:14 +01:00
jedk1
918c09b096 Update Spirit jar and Who Command 2016-03-10 18:53:45 +00:00
jedk1
995b20f7e0 Update canBind() for spirits. 2016-03-10 18:32:11 +00:00
jedk1
a922b8bd17 Add support ready for when spirits is added. 2016-03-10 18:26:16 +00:00
jedk1
fe4eb8ca25 Update MySQL to support custom elements 2016-03-10 15:15:49 +00:00
FinnBueno
ab4f017c4f Fixed death messages and colour support for custom elements. 
Fixed the death messages not being broadcasted and added proper colour
support for addon elements. Also re-order the language.yml to give it
some more structure.
 2016-03-08 00:52:10 +01:00
OmniCypher
ce400a4c1b Merge pull request #440 from FinnBueno/master 
Language.yml -- Finally...
 2016-03-07 11:39:02 -08:00
StrangeOne101
acec583b1a Add RPG Command Tabbing 
• Added tabbing support for the avatar and worldevent commands from RPG
 2016-03-06 18:58:45 +13:00
FinnBueno
9857afdb30 Fix merge conflicts 2016-03-05 20:42:41 +01:00
FinnBueno
4380102f39 Adding language.yml -- Removed deathmessages.yml 
Added a language.yml in which almost every message in the plugin can be
found. I moved the move descriptions, and death messages to that file,
so the deathmessages.yml has been removed, because it has nothing in it
anymore.
 2016-03-05 12:12:31 +01:00
jedk1
daf4267727 Fix players grabbing water through walls 2016-03-05 01:25:45 +01:00
savior67
b6e7f57fec - Added DamageHandler class 2016-03-05 01:25:45 +01:00
savior67
ed0109d2f4 - damageEntity function moved out of GeneralMethods into DamageHandler 
- All damaging abilities now invoke DamageHandler.damageEntity
 2016-03-05 01:25:45 +01:00
savior67
51af720bfa - Added cooldown to AirScooter (same cd as firejet by default) 2016-03-05 01:25:44 +01:00
Benford
c4a0187e4a Fix ConfigType 
- Fixed errors with ConfigType
 2016-03-05 01:25:43 +01:00
jedk1
3410c470df Fix WaterSourcing 2016-03-05 01:19:35 +01:00
Benford
02b2f2a915 Add new staff 
- Added new staff members to whocommand
 2016-03-05 01:19:35 +01:00
FinnBueno
bcf91e6859 Added a language.yml 2016-03-05 01:17:17 +01:00
jedk1
d7150ff2c4 Fix players grabbing water through walls 2016-03-03 12:38:28 +00:00
OmniCypher
3f78596809 Merge pull request #438 from savior67/master 
Added cooldown to airscooter | Added DamageHandler
 2016-03-02 18:35:48 -08:00
savior67
fd8fa2b1ec - Added DamageHandler class 2016-03-02 21:01:36 -05:00
savior67
d8d3c416c1 - damageEntity function moved out of GeneralMethods into DamageHandler 
- All damaging abilities now invoke DamageHandler.damageEntity
 2016-03-02 20:54:15 -05:00
savior67
329b01f3aa - Added cooldown to AirScooter (same cd as firejet by default) 2016-03-02 20:50:25 -05:00
OmniCypher
d90fcbb982 Merge pull request #437 from jedk1/master 
Fix WaterSourcing
 2016-03-02 17:47:25 -08:00
Benford
94cc849767 Fix ConfigType 
- Fixed errors with ConfigType
 2016-03-02 13:29:24 -05:00
Benford
c50c227f05 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-03-02 13:28:44 -05:00
jedk1
7ac86b30f3 Fix WaterSourcing 2016-03-02 16:29:27 +00:00
Benford
05607a9836 Add new staff 
- Added new staff members to whocommand
 2016-03-01 15:59:17 -05:00
OmniCypher
66c7be3ddc Merge pull request #434 from jedk1/master 
Various Fixes
 2016-02-29 17:14:00 -08:00
Benford
e332875e1b Change to fit Rpg configs 
- Changed configtype to not be an enum
- Removed an unused import
- Edited configmanager to match ConfigType
 2016-02-29 15:36:19 -05:00
jedk1
6e0c9f50ca Fix bug with abilities duping 2016-02-29 16:11:45 +00:00
jedk1
975cfa87c2 Add documentation and update Who command 2016-02-28 14:35:19 +00:00
jedk1
3509a03a59 Fix Choose Command 2016-02-28 00:27:47 +00:00
OmniCypher
15fe8ad2ae Merge pull request #430 from Simplicitee/master 
Fix boolean in FireBlast
 2016-02-27 10:34:58 -08:00
jedk1
5704171066 Merge branch 'master' of https://github.com/ProjectKorra/ProjectKorra 2016-02-27 18:22:15 +00:00
jedk1
1c0acc0f29 Fix no method for getAbility() 2016-02-27 18:21:53 +00:00
Benford
6b345c7c2e Fix boolean in FireBlast 
- The isFireBurst boolean was never set to false for normal fireblast
 2016-02-27 12:47:19 -05:00
OmniCypher
a1840b52e9 Merge pull request #429 from OmniCypher-/master 
Various Fixes & Additions
 2016-02-27 00:00:53 -08:00
OmniCypher
dcdd8efd3e Various Fixes & Additions 
Adds Plant & Ice source list to config
Removes PackedIce option (can now be set or removed through Ice list)
Fixes being able to select through walls
 2016-02-26 23:57:55 -08:00
Benford
054827986c Fix FireBlast damage 
- Added the variable for FireBlast damage to be set
- Added getDayFactor to damage and a range variable in FireBlast
 2016-02-26 20:28:51 -05:00
Benford
91b823084b Add Residence to softdepend 
- Added Residence to softdepend in plugin.yml
 2016-02-26 19:54:05 -05:00
Benford
cdfdcb570d Add Residence plugin support 
- Added two new config options, Residence.Respect and Residence.Flag (in
the according spot)
- Residence.Respect will respect if true
- Residence.Flag specifies the flag that needs to be set to true for
bending to be enabled in a residence.
- Is put in isRegionProtected methods
 2016-02-26 19:39:44 -05:00
Benford
b4a7a62362 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-26 18:57:18 -05:00
Benford
d93d34b286 Fix fall damage animation 
- Fixed fall damage animation activating for chiblockers
 2016-02-26 18:52:02 -05:00
OmniCypher
280de9fca4 Merge pull request #424 from Simplicitee/master 
Fix shockwave and other
 2016-02-25 15:24:47 -08:00
Benford
5d244d0eac Fix shockwave 
- Fixed shockwave fall version
- Removed various unnecessary methods called when fall damage was taken.
 2016-02-25 17:22:37 -05:00
jedk1
c1c2b26b55 Change null in ElementType to NO_SUFFIX 2016-02-25 15:25:40 +00:00
jedk1
1da3c3b1d0 Update TabComplete to support Custom Elements 2016-02-25 00:38:08 +00:00
jedk1
78a341e636 Fix NPE with Custom Elements 2016-02-25 00:15:52 +00:00
jedk1
042866ec62 Add support for custom elements 2016-02-24 23:23:03 +00:00
jedk1
f599b5ca1e Change Element and SubElement to public 2016-02-24 00:46:30 +00:00
jedk1
1836888070 Add remove call to QuickStrike 2016-02-23 22:12:24 +00:00
jedk1
b3679e8829 Fix DeathMsgs & ReloadEvent 2016-02-22 17:01:54 +00:00
Philip Stephenson
b6e4e088f5 Add CommandSender to BendingReloatEvent, cleanup other events 2016-02-21 20:43:36 -05:00
OmniCypher
397d8c863a Merge pull request #419 from kingbirdy/bendingevents 
Remove unneeded damageEntity method, update events
 2016-02-21 13:16:30 -08:00
Philip Stephenson
c0fe8256b7 Remove unneeded damageEntity method, update events 
- change EntityBendingDeath and HorizontalVelocityChange to use Ability objects, instead of strings

- update abilities to reflect changes
 2016-02-21 16:01:28 -05:00
jedk1
3d2676a999 Fix ChiCombo NPE and FallDamage 2016-02-20 17:36:22 +00:00
Philip Stephenson
3ddc100ffc Add AbilityDamageEntityEvent AbilityStartEvent and AbilityEndEvent 
- change GeneralMethods.damageEntity to use event
- removed BendingDamageEvent
- update CoreAbility to create and process the events
 2016-02-19 23:03:50 -05:00
OmniCypher
ea68b6a99c Merge pull request #415 from grasshopperMatt/master 
Fixed whocommand
 2016-02-19 18:41:21 -08:00
OmniCypher
fe47af9630 Merge pull request #416 from kingbirdy/master 
Fix disabled abilities outputting multiple times
 2016-02-19 18:39:55 -08:00
Philip Stephenson
20ae458d57 Fix disabled abilities outputting multiple times 2016-02-19 19:56:50 -05:00
Matt
ae35e1423d Fixed whocommand 2016-02-19 19:20:41 -05:00
Matt
8f552d225e Added new method 2016-02-19 18:57:55 -05:00
Matt
bddcd989a3 Changed private handlers - public 2016-02-19 18:54:48 -05:00
Matt
0cc79f226f Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-19 18:30:23 -05:00
Matt
eca0eca1f8 Fixed & added new args 2016-02-19 18:28:17 -05:00
Matt
97348c9424 Added ability to BendingDamageEvent 2016-02-19 18:24:03 -05:00
Matt
23e03f310f Added code to BendingDamageEvent 2016-02-19 18:12:20 -05:00
OmniCypher
b6f36c1e63 Merge pull request #413 from Simplicitee/master 
Fix FireCombo
 2016-02-19 15:03:25 -08:00
Benford
7ec229ff41 Fix FireCombo 
- Makes FireCombos cook animal meat when killing (excludes JetBlast)
 2016-02-19 17:53:59 -05:00
Matt
91de6ce20d Added BendingDamageEvent 2016-02-19 17:53:18 -05:00
Matt
4701e5f9cf Fixed healingwaters shift functionality 2016-02-19 17:41:39 -05:00
Benford
bb88553db0 Various changes 
- Changed where the cooldown is called in AirSwipe
- Added instances for FireDamageTimer in appropriate firecombos
- Fixed math mistake in WaterSpout
 2016-02-18 18:03:32 -05:00
Benford
af0cd7f3f7 Horizontal Collisions and Barriers 
- Added a config option for if the block a player hits with horizontal
collisions is barrier.
 2016-02-17 22:58:10 -05:00
Benford
e8e3a6f4ee Fix WaterSpout 
- Fix removeSpouts method (needs to be tested because I couldn't test it
alone
- Fix remove setting flying and allow flight
 2016-02-17 19:43:59 -05:00
Benford
79ecbf49c1 Various fixes 
- Fixed several warnings
- Renamed BindingUpdateEvent to BindChangeEvent
- Fixed Icespike cooldown, pillar field, and pillar version
- Fixed WaterAbility.getNightFactor(double, World)
- Fixed AirShield knockback being more powerful than it should be
 2016-02-17 19:14:30 -05:00
Benford
123f117f3d Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-17 16:30:50 -05:00
jedk1
1e24828e73 Fix Bloodbending 2016-02-17 20:20:10 +00:00
jedk1
cb4003993f Fix Bloodbending 2016-02-17 20:19:18 +00:00
jedk1
c67f28fbb4 Fix Combos 2016-02-17 14:26:34 +00:00
OmniCypher
a0c13895e3 Merge pull request #406 from savior67/master 
- /b who command now shows Chiblocker instead of Chibender
 2016-02-15 19:35:08 -08:00
savior67
dbef318caf - /b who command now shows Chiblocker instead of Chibender 2016-02-15 22:30:08 -05:00
OmniCypher
f5c709799d Merge pull request #405 from savior67/master 
- AirBurst no longer triggers doors/buttons/levers
 2016-02-15 19:22:35 -08:00
savior67
a04409123c - Airburst no longer triggers doors/buttons/levers 2016-02-15 22:17:43 -05:00
OmniCypher
b701c86387 Merge pull request #404 from savior67/master 
- EntityBendingDeathEvent now triggers from fire-related deaths
 2016-02-15 19:14:09 -08:00
savior67
81bcfa9867 - EntityBendingDeathEvent now triggers when an entity is killed by fire originating from a bending ability 2016-02-15 21:40:05 -05:00
OmniCypher
db257aa5f7 Fixes Dynamic dig depth & EarthSmash grab distance 2016-02-15 16:45:16 -08:00
OmniCypher
8527705ff3 Various fixes 
Fixes cooldowns affecting fall induced shockwaves and airbursts
Fixes airscooter randomly ending
Fixes avatarstate causing jitter on airscooter
Fixes airscooter removing fly
Fixes preset message for perm remove
 2016-02-14 13:50:02 -08:00
OmniCypher
27a658affe Merge pull request #401 from RoboMWM/patch-1 
Compatibility with other plugins' explosions; resolves #400
 2016-02-14 12:30:04 -08:00
savior67
4ac4a2f646 - Changed PlayerBendingDeathEvent to EntityBendingDeathEvent 2016-02-13 12:42:35 -05:00
savior67
2953a7b921 Merge remote-tracking branch 'upstream/master' 2016-02-13 11:58:36 -05:00
RoboMWM
94787e5f39 Compatibility w/ other plugins' explosions #400 
Is there a reason why this was placed here? If such a thing is needed, it'd be nice if it were under a config option then.
 2016-02-11 22:57:17 -08:00
Benford
cf305aa53d Fix waterspout fly glitch 
- Fixed a fly glitch when a player goes over land with waterspout
 2016-02-11 21:55:48 -05:00
OmniCypher
82bc520695 Merge pull request #398 from Simplicitee/patch-2 
Update icebullet
 2016-02-11 18:35:21 -08:00
OmniCypher
be947344f3 Merge pull request #397 from StrangeOne101/master 
Made Element Protected
 2016-02-11 18:35:15 -08:00
Simplicitee
6c46e3d87e Update icebullet 
- Update icebullet right to use RIGHT_CLICK_BLOCK
 2016-02-11 11:28:57 -05:00
StrangeOne101
c05c1987cb Made Element Protected 
• Allows elements to be created by side-plugins
 2016-02-11 22:00:32 +13:00
Benford
a20b4a1001 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-09 21:50:32 -05:00
Benford
34063d6dc6 Fix WaterManipulation 
- Fixed WaterManipulation range being buggy
 2016-02-09 21:49:55 -05:00
BuildTools
212c079058 - Added BindingUpdateEvent 2016-02-09 20:27:25 -05:00
jedk1
6f05457229 Fix Event NPE in Remove command 2016-02-09 19:38:06 +00:00
jedk1
31177b4d98 Fix WaterBubble not working 2016-02-09 19:27:24 +00:00
jedk1
497e464cc8 Update to commit 373 
Remove unused variables

Update to commit 373
 2016-02-09 17:17:51 +00:00
jedk1
2cb24ac3ad Fix NPE in IceSpike 2016-02-09 17:00:16 +00:00
jedk1
9c8c9c1741 Update ComboManager to new ClickTypes 2016-02-09 15:22:15 +00:00
jedk1
1e683032b1 Fix Presets duplicating on b reload 2016-02-09 14:44:12 +00:00
jedk1
db6d7a9e8b Fix Water Bugs 2016-02-09 14:23:04 +00:00
OmniCypher
ea4beea1a2 Fixes Presets & Copy Command 2016-02-08 17:08:58 -08:00
jedk1
36d710e6ec Fix EarthBlast revert source data 2016-02-08 16:42:08 +00:00
jedk1
4cbd49519c Fix EarthSmash Bugs 2016-02-08 15:18:16 +00:00
jedk1
d58267553e Fix AirSpout in disabled worlds 2016-02-08 14:09:59 +00:00
jedk1
320a43e911 Fix Torrent multiple sourcing 2016-02-08 13:55:15 +00:00
jedk1
048a170e24 Fix WaterSpout & WaterWave 2016-02-08 13:05:06 +00:00
Benford
793ef9b3d6 Change bloodbending method, Add zach to staff list, misc 
- Changed bloodbending method isBloodbended to isBloodbent
- Added zach to the staff list
- Changed ClickType: (UNTESTED)
- Added JUMP, MOVE_FORWARD, MOVE_BACKWARDS, MOVE_LEFT, MOVE_RIGHT,
CUSTOM, RIGHT_CLICK_BLOCK, RIGHT_CLICK_ENTITY
- Removed SHIFT and CLICK
- Removed unnecessary methods in BendingManager
- Removed unnecessary defaults from ConfigManager
 2016-02-07 21:47:13 -05:00
Benford
b439c84056 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-07 21:23:26 -05:00
jedk1
b3d9d3bb18 Various Fixes 2016-02-07 16:24:54 +00:00
Benford
ccb5053f7f Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2016-02-05 13:15:38 -05:00
jedk1
9c39cd3f7b Fix smokescreen ignoring cooldowns 
Fix all chi abilities not respecting cooldowns

Various Fixes

Fix earthsmash turning everything to dirt
Fix waterspout not letting users fast swim

Fix tornado & Fix FireJet being harmless
 2016-02-04 13:23:06 +00:00