Commit graph

1410 commits

Author SHA1 Message Date
OmniCypher
3287e891c1 WaterWave NPE Fix
Fixes WaterWave origin NPE.
2015-11-18 16:01:12 -08:00
OmniCypher
e1bbc6ea7f Merge pull request #301 from Simplicitee/master
Fix display command console, Change horizontal velocity for addons
2015-11-15 17:11:45 -08:00
Benford
80c9c95ca6 Fix horizontal velocity w/ addons
- Changes HorizontalVelocityTracker and HorizontalVelocityChangeEvent
contructors to use Element and SubElement so Death messages use color,
and Switched StockAbility with String for Addon compatibility
2015-11-15 20:00:12 -05:00
Benford
9603a98d7e Fix Display command
- Fixed display command when used in console
2015-11-15 19:26:30 -05:00
Benford
9ef63df3a7 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-11-15 19:24:46 -05:00
OmniCypher
ac33709317 Merge pull request #300 from StrangeOne101/master
Add Autotabbing to Commands
2015-11-15 16:12:14 -08:00
OmniCypher
65855ff395 Merge pull request #299 from Simplicitee/master
Fix ChiBlocking and Configurations, Remove import
2015-11-15 16:11:24 -08:00
StrangeOne101
d0ba3598e1 Add Autotabbing to Commands
• Tabbing now works in the bending command and all applicable
subcommands.
2015-11-16 12:52:39 +13:00
Benford
282c846e00 Fix chiblocking, Fix Configurations
- Fixed willChiBlock not working because of incorrect configurations
- Added check for SwiftKick and QuickStrike augments
- Fixed configurations for AcrobatStance
2015-11-15 17:52:45 -05:00
OmniCypher
e4b130b6b3 Merge pull request #298 from kingbirdy/master
Change travis-ci to compile with java 7 and 8
2015-11-15 14:17:37 -08:00
kingbirdy
a8bf90f15a Change travis-ci to compile with java 7 and 8 2015-11-15 17:12:33 -05:00
Benford
4fe55cff81 Remove unused import
- Removes unused bukkit import
2015-11-15 15:52:18 -05:00
Benford
0b2d05ff9e Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-11-15 15:00:10 -05:00
OmniCypher
bc462eb5c5 Merge pull request #297 from OmniCypher-/master
Velocity Death Message Fix
2015-11-14 17:18:51 -08:00
OmniCypher
db76fe8334 Velocity Death Message Fix
Fixes Velocity DeathMessages
2015-11-14 17:17:20 -08:00
OmniCypher
12cf8daa60 Merge pull request #296 from Simplicitee/master
Changes
2015-11-14 11:40:48 -08:00
Benford
8bbb331953 Fix AirScooter
- Fixed AirScooter users being launched up by water when going through a
standing wall of water.
- Also makes imports match importorder
2015-11-14 03:50:45 -05:00
Benford
10c8afcb4d Github. Why. 2015-11-14 03:07:50 -05:00
Benford
3b824e6bfd Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-11-14 02:56:05 -05:00
Benford
dd58b54c1d Woops 2015-11-14 02:53:39 -05:00
Benford
da70beedb9 Fix death message
- Fix OctopusForm death message spelling error
- Fix SubElement display command error
- Improve HorizontalVelocity with ability list and death messages (Needs
to be tested by someone that has a server where multiple people can
join)
- Fix getSubBendingColor incomplete-switch
- Add getSubElementByString(String sub) to generalmethods. Convenience.
- Add avatar option to display command
- Add enum AvatarAbilities to StockAbility
2015-11-14 02:53:18 -05:00
OmniCypher
f3cbdcb331 Merge pull request #295 from kingbirdy/fix/earthcolumn
Fix memory leak in EarthColumn
2015-11-13 16:25:18 -08:00
kingbirdy
e2e0493253 Fix memory leak in EarthColumn
Unnecessary variables were being used to store raised blocks to prevent
them from being raised again. Removed the variables and added a check that
blocks couldn't be raised if there was air beneath them, accomplishing the
same thing.
2015-11-13 19:05:41 -05:00
OmniCypher
7f0c258311 Merge pull request #294 from nathank33/master
Removed CoreAbility From Stock Abilities
2015-11-11 15:55:30 -08:00
nathank33
29873e139a Decoreability cleanup 2015-11-11 15:31:34 -08:00
nathank33
e84b239665 Finish decoreability 2015-11-11 15:30:19 -08:00
nathank33
6760985369 Decoreability Fire and Air 2015-11-11 15:29:30 -08:00
nathank33
10414ffd90 Revert FireAbilities Part 1 2015-11-11 15:27:20 -08:00
OmniCypher
7105b0c4c7 Merge pull request #293 from Simplicitee/master
Changes
2015-11-10 22:55:34 -08:00
Benford
a6a59179e3 Merge branch 'master' of https://github.com/Simplicitee/ProjectKorra 2015-11-10 22:23:49 -05:00
Benford
07bf7874aa Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-11-10 22:22:49 -05:00
Simplicitee
392adf47ce Merge pull request #1 from ProjectKorra/master
lol
2015-11-10 22:02:49 -05:00
Benford
cf985e2501 Changes 2015-11-10 21:39:04 -05:00
Benford
2624f24d5e Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-11-09 18:31:03 -05:00
OmniCypher
292edaf0f6 Merge pull request #291 from nathank33/master
Update /b debug to display more variables
2015-11-09 15:14:21 -08:00
nathank33
bb223ab505 Update debugger to display private fields 2015-11-09 13:25:33 -08:00
OmniCypher
b2000e7e22 Merge pull request #290 from Simplicitee/master
MetalClips fix and miscellaneous
2015-11-08 21:50:57 -08:00
Benford
5306e45fc8 MetalClips fix and miscellaneous
- Fixes MetalClips errors:
- Only being able to metalclip one entity, even when hitting other
entities
- MetalClips stops working after killing targeted entity
- Removes unused imports and suppresswarnings
- Adds MetalClips throwing config option and permission. Used when the
player is controlling an entity and clicks. (Recommended: Delete the
MetalClips description line in the config, then reload server)
2015-11-08 23:51:49 -05:00
OmniCypher
a8709e6086 Merge pull request #286 from Simplicitee/patch-22
Fix invincible FireJet
2015-11-08 19:56:15 -08:00
OmniCypher
7b0c25520e Merge pull request #287 from Simplicitee/patch-23
Fix invincible Catapult
2015-11-08 19:56:05 -08:00
OmniCypher
09bef9196e Merge pull request #288 from Simplicitee/patch-24
Add Bloodbending node
2015-11-08 19:55:57 -08:00
OmniCypher
c36cfbe3fb Merge pull request #289 from Simplicitee/patch-25
Add check
2015-11-08 19:55:48 -08:00
Simplicitee
94e4a6bc43 Add check
- Adds check, in stopBending(), for invincible being empty or not, clears it if so
2015-11-08 22:27:53 -05:00
Simplicitee
5e743cd247 Add Bloodbending node
- Adds bloodbending permission node to bending.water, false default.
2015-11-08 22:23:56 -05:00
Simplicitee
fa9ee5e53c Removal
- Removes second instance of GeneralMethods.invincible.add(this); from FireJet, unneeded.
2015-11-08 22:19:22 -05:00
Simplicitee
db130258c3 Fix invincible Catapult
- Fixes invincible in Catapult, removing that instance of Catapult from the invincible arraylist
2015-11-08 22:17:45 -05:00
Simplicitee
e606c08836 Fix invincible FireJet
- Fixes invincible in firejet, making it remove that instance of firejet from the invincible arraylist
2015-11-08 22:15:51 -05:00
OmniCypher
f025631a17 Merge pull request #285 from OmniCypher-/master
Fixes
2015-11-07 22:09:59 -08:00
OmniCypher
33e63d1bc3 Fixes
Fixes Clear arguments
Fixes Velocity Damage
2015-11-07 18:22:39 -08:00
OmniCypher
74e4f1bcb6 Merge pull request #284 from OmniCypher-/master
Fixes
2015-11-07 16:18:49 -08:00