Commit graph

1334 commits

Author SHA1 Message Date
Matt
a397746c65 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-12-15 19:01:04 -05:00
Matt
f96322dfe7 Fixed small bugs in Cooldown and Dynamic Sourcing 2015-12-15 18:41:48 -05:00
ChaoticDev
d362fc6aec Fixed typo in the source code 2015-12-13 19:15:59 +02:00
ChaoticDev
cf50695103 Fixed typo in the source code 2015-12-13 19:14:55 +02:00
Matt
90afa1f9e5 Removed some methods in EarthMethods / WaterMethods 2015-12-12 21:21:11 -05:00
Matt
d84b0977ff Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-12-12 21:12:20 -05:00
Matt
d5b6ac24cb Finished AutoSourcing, added config options for DynamicSourcing
Added cooldowns to AirBurst, Flight, OctopusForm, PhaseChange,
WaterManipulation, EarthBlast, RaiseEarth, EarthGrab, Shockwave, Blaze
and FireBurst
2015-12-12 21:12:09 -05:00
Matt
ba2818ac2e Finished AutoSourcing implementation to all moves 2015-12-12 12:57:38 -05:00
OmniCypher
a7e97e86f1 Merge pull request #325 from StrangeOne101/master
Fix Fireball NPE
2015-12-09 21:02:39 -08:00
jedk1
b7bb87c10c Fix bending player NPE in FireBurst 2015-12-08 23:40:03 +00:00
StrangeOne101
85cb6e3720 Fix Fireball NPE
• Fixes NPE in Fireball
• Fixes measuring distance across worlds
2015-12-08 23:28:17 +13:00
jedk1
04a006cac9 Fix getEntitiesAroundPoint getting spectator players. 2015-12-06 19:25:10 +00:00
Jack Lin
669ef4f73b Add 30 second timeout to Updater 2015-12-06 15:18:50 +13:00
Benford
ef9166a64d Changes to bending who
- Added different display for toggled bending/elements
- Commented out staff that aren't staff anymore
2015-12-01 23:42:40 -05:00
Benford
2ec5849e73 Auto Tab fix
- Changed two instances of canBend to canBind
2015-12-01 00:18:14 -05:00
Benford
a3b2b798e0 Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-12-01 00:12:35 -05:00
Benford
bd1065daa1 Change /bending who list
- /bending who list now shows appropriate elements and staff title
2015-12-01 00:12:28 -05:00
OmniCypher
f9897d713d Merge pull request #317 from StrangeOne101/master
Fix Bloodbending Bugs and Permissions
2015-11-30 20:41:59 -08:00
jedk1
d1d6091061 Fix NPE on update 2015-12-01 00:49:51 +00:00
jedk1
2df6bbc699 Fix missing Element and Subelement args. 2015-11-27 16:56:42 +00:00
jedk1
f12052dbbe Fix NPE on player log out. 2015-11-26 18:24:34 +00:00
OmniCypher
39d3df50e4 Merge pull request #311 from Simplicitee/master
Fix commands, Fix EarthSmash bug
2015-11-25 13:29:24 -08:00
jedk1
4b85875c18 Fix BendingPlayer NPE of player log out 2015-11-25 21:23:27 +00:00
jedk1
06b999c6c6 Fix Avatar Death Message color 2015-11-25 13:40:29 +00:00
Benford
0bc485954a Fix commands, Fix EarthSmash bug
- Remove command:
- Fixed element aliases not working
- Added argument /b remove <element> which only removes a single element
from you if you have it. Tells you if you don't
- Fixed toggle command aliases and message messing up
- EarthMethods:
- Added isMetalbendable(Player player, Material mat)
- Checks for the material being in the metalblocks list in config and if
the player has metalbending permission
- Added check for metal blocks in getEarthSourceBlock()
- Fixed EarthSmash having problems with metal blocks
2015-11-25 01:27:15 -05:00
jedk1
c6dfe0027a Fix distance errors 2015-11-25 01:18:57 +00:00
jedk1
3f1a260bd3 Merge remote-tracking branch 'upstream/master' 2015-11-25 01:12:40 +00:00
jedk1
fbdab10c3f Fix fly glitch with AirSpout & Tornado 2015-11-25 01:10:59 +00:00
jedk1
3a151eb2d5 Fix bending activating on block right click 2015-11-25 01:10:38 +00:00
StrangeOne101
ed131156ce Fix Bloodbending in Non-Solid Blocks
• Fixes Bloodbending not moving mobs in non-solid blocks
2015-11-25 12:57:14 +13:00
StrangeOne101
21d851fd69 Fix Op Permissions
• Fixes Ops not having all bending permissions (bloodbending, etc)
2015-11-25 12:38:36 +13:00
OmniCypher
064d9ba3bd Merge pull request #309 from Simplicitee/master
Major fixes to Toggle command, Firebending instances fixes
2015-11-24 14:14:53 -08:00
Benford
e29a575a3c Fixes (too many for title)
- Fixed AirShield not blocking earth and water abilities.
- Fixed AirSwipe stopping when it hit a non living entity
- Fixed AutoTab not allowing player names with who command
- Fixed Permaremove command permissions
- Fixed Enflamed instances being managed
- Fixed FireStream dissipation being managed
- Fixed HorizontalVelocity:
- Entity not being removed from instances when landing and not hitting
wall
- Still adding entities to instances when disabled
- Fixed toggle element command working for everyone, see below:
- Added bending.admin.toggle permission, used for toggling elements of
another player (need to add other player bending toggling but Chris
rushed me)
- Changed getBendingPlayer to be more exact with uuids
2015-11-24 17:08:59 -05:00
jedk1
9ab23ca38d Fix MultiAbilities not supporting Avatar Abilities 2015-11-24 14:41:00 +00:00
jedk1
9967d46fb1 Change canBend to canBind 2015-11-19 18:21:09 +00:00
jedk1
2af7587080 Add bubbles to Torrent & WaterManip
Add bubble particles to Torrent & WaterManipulation if they are
underwater.
2015-11-19 14:42:59 +00:00
StrangeOne101
f029d0806f Fix Commands
• Fixed Syntax
• Again fixed Autotabbing
2015-11-19 15:00:39 +13:00
OmniCypher
304470fedd Merge pull request #304 from OmniCypher-/master
Beta 6
2015-11-18 17:20:12 -08:00
StrangeOne101
1bce58580b Fix Missing Autotab Arguments
• Adds in subs for display
• Adds combos for help
• Removed subs from help
2015-11-19 13:22:48 +13:00
OmniCypher
9d327315d5 Beta 6 2015-11-18 16:11:22 -08:00
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
OmniCypher
ac33709317 Merge pull request #300 from StrangeOne101/master
Add Autotabbing to Commands
2015-11-15 16:12:14 -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
Benford
4fe55cff81 Remove unused import
- Removes unused bukkit import
2015-11-15 15:52:18 -05:00
OmniCypher
db76fe8334 Velocity Death Message Fix
Fixes Velocity DeathMessages
2015-11-14 17:17:20 -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
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
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
Benford
07bf7874aa Merge remote-tracking branch 'refs/remotes/ProjectKorra/master' 2015-11-10 22:22:49 -05:00
Benford
cf985e2501 Changes 2015-11-10 21:39:04 -05:00
nathank33
bb223ab505 Update debugger to display private fields 2015-11-09 13:25:33 -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
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
33e63d1bc3 Fixes
Fixes Clear arguments
Fixes Velocity Damage
2015-11-07 18:22:39 -08:00
OmniCypher
0fae906385 Fixes
Fixes Waterwave crash
Fixes Debug permission message
Fixes Bind toggling message
Fixes BendingPlayer isElementToggled NPE
2015-11-07 16:16:46 -08:00
OmniCypher
6975513d7f Merge pull request #282 from Simplicitee/patch-20
Fix element toggling
2015-11-07 13:47:21 -08:00
Simplicitee
97f6724cf5 Fix message
- Fixes Element toggle message
2015-11-07 16:44:58 -05:00
Simplicitee
2c0461fb8b Fix element toggling
- Fixes element toggling not toggling passives with it
2015-11-07 16:36:08 -05:00
OmniCypher
733d797f1c Merge pull request #281 from nathank33/master
Update Combo Cleanup
2015-11-07 11:46:23 -08:00
nathank33
ac3cf4cecb Change combo cleanup 2015-11-07 11:21:00 -08:00
OmniCypher
1aee6eff06 Merge pull request #279 from nathank33/master
Improved /b debug to display more information
2015-11-07 10:29:53 -08:00
Simplicitee
d7fcd07d89 Fix Element Toggle
- Fixes element toggle caused error
2015-11-07 02:57:57 -05:00
nathank33
e27356eba0 Add collection sizes to debug command 2015-11-06 23:01:21 -08:00
OmniCypher
7c1290378b Merge pull request #278 from Simplicitee/patch-17
Fix Catapult
2015-11-06 19:19:11 -08:00
OmniCypher
f5855e6552 Merge pull request #277 from Simplicitee/patch-16
Fix Charged Fireblast
2015-11-06 19:19:04 -08:00
OmniCypher
1923b7ef97 Merge pull request #276 from Simplicitee/patch-15
Fix FireBlast
2015-11-06 19:18:58 -08:00
OmniCypher
957c1cbef0 Merge pull request #275 from Simplicitee/patch-14
Fix AirBurst
2015-11-06 19:18:52 -08:00
OmniCypher
2b677fe8a5 Merge pull request #274 from Simplicitee/patch-13
Fix
2015-11-06 19:18:45 -08:00
Simplicitee
6ba07479d2 Fix Catapult
- Removes 2nd instance of reloadVariables()
2015-11-06 13:32:26 -05:00
Simplicitee
e286698e63 Fix Charged Fireblast
- Removes fireblast being instantiated if a player stops sneaking whilst charging fireblast
2015-11-06 13:29:19 -05:00
Simplicitee
e44a9d0ae3 Fix FireBlast
- Remove 2nd instance of reloadVariables()
2015-11-06 13:24:18 -05:00
Simplicitee
8173c2cb56 Fix AirBurst
- Remove 2nd instance of reloadVariables()
2015-11-06 13:22:31 -05:00
Simplicitee
075d2b1c2e Fix
- Remove 2nd instance of reloadVariables()
2015-11-06 13:19:56 -05:00
Simplicitee
b0b752dfbe Update HorizontalVelocityTracker.java 2015-11-06 13:00:30 -05:00
Simplicitee
045311e44c Add import
- Add missing import of BlockFace
2015-11-06 12:58:48 -05:00
Benford
b5112874af Merge remote-tracking branch 'origin/patch' into patch 2015-10-25 12:41:57 -04:00
Benford
11c0bf6329 General fixes and new additions 2015-10-25 12:03:15 -04:00
StrangeOne101
f902a8ac7c Fix WaterSpout Bugs
• Fixes WaterSpout not working over packed ice
• Fixes WaterWave exception when teleporting across worlds
• Fixes compile warnings (they were annoying me!)
2015-10-18 12:14:49 +13:00
OmniCypher
7669486103 Various fixes; Perm water & ice, reloadVariables
Removes reloadVariable() from all constructors
Fixes Surge perm ice and water
Removes Water Passive (extremely inefficient)
Alters playIceBendingSound() to make PhaseChange more bearable
Fixes NPE's in Flight
Fixes NPE in DisplayCommand
Light overall cleanup (Unused imports/dead code)
Fixes memory leak in ComboManager
2015-10-17 10:17:21 -07:00
Jack Lin
bc05dcdfdd Change RevertChecker Sets back into Maps 2015-10-06 14:34:26 +13:00
Jack Lin
137e71cf01 Move HorizontalVelocityChangeEvent to event package 2015-10-03 18:11:10 +13:00
Jack Lin
de560d598c Increase performance in RevertChecker 2015-10-03 18:05:34 +13:00