Commit graph

929 commits

Author SHA1 Message Date
AlexTheCoder
3ead8469cc Cooldown Modifications
AvatarState Cooldown Modifications:
- Converted the AvatarState to use the same BPlayer cooldown manager as
all the other abilities

CooldownChangeEvent Modifications:
- Make cooldown changes cancellable so as to increase API functionality
2015-03-14 04:13:27 -04:00
AlexTheCoder
853aec2b5b Spring Cleaning!
Cleaned up the Code:
- Removed all unused imports
- Added suppress warning annotations to all warnings
2015-03-14 02:10:25 -04:00
MistPhizzle
1446dcc1d4 1.6.0 BETA 16 2015-03-08 12:45:09 -04:00
MistPhizzle
e826dac198 Merge pull request #104 from nathank33/master
Code Cleanup
2015-03-08 12:32:30 -04:00
Jack Lin
d56380a5e3 Fix NPE in OctopusForm 2015-02-19 10:11:10 +13:00
Jack Lin
2e336595c0 Fix NPE caused by revert() in Flight 2015-02-19 10:10:55 +13:00
Jack Lin
a34bdbaa62 Fix incorrect world check FireShield 2015-02-17 21:54:44 +13:00
nathank33
6d3a48b189 Lightning Merge Conflict 2015-02-15 22:43:40 -08:00
Jack Lin
1a405d296e Add world checks EarthSmash 2015-02-16 19:08:07 +13:00
Jack Lin
386904e300 Add world check AirSwipe 2015-02-16 19:07:57 +13:00
Jack Lin
ce7838f618 Fix NPE in Methods for isChiBlocked() 2015-02-16 19:01:23 +13:00
Jack Lin
e9827fd499 Add world checks FireShield 2015-02-16 18:26:49 +13:00
Jack Lin
bb9dc95dd7 Add world check AirShield 2015-02-16 18:25:05 +13:00
Jack Lin
a6213f6f66 Fix WaterManipulation NPE 2015-02-16 18:24:55 +13:00
Jack Lin
6fc808fd71 Attempt NPE fix FireCombo
getTopBlock() could return null. You cannot getLocation() of null
therefore generating NPE
2015-02-16 18:24:36 +13:00
Jack Lin
ec1cfff771 Fix NPE in Flight 2015-02-16 17:37:08 +13:00
MistPhizzle
fc5646e4f9 1.6.0 BETA 15 2015-02-08 10:50:08 -05:00
MistPhizzle
d30058d707 Merge pull request #97 from Carbogen/master
Added a ComboAddonAPI and fixed some bugs with HorizontalCollision Damage
2015-02-08 10:46:51 -05:00
HeyAwesomePeople
0236b2072e Updated Commands.java
Line 792 was causing SQLException: "Before start of result set". Fixed by placing the call to result set in the for loop, which insures that the string calling of "uuid" will work.
2015-02-07 21:02:18 -08:00
Brendan Wilson
7131f516bb Implemented a custom addon Combo API
Reworked my old ComboModuleAPI and built it right into ProjectKorra
Core. This version supports /pk h <element>combo messages and will
append the addon-combo's description and instructions to the messages
sent. I also reworked the way the combos are coded to make them very
similar to ordinary addon abilities.
2015-02-07 17:01:22 -05:00
Brendan Wilson
da94a97538 Altered the HVCEvent listener
Added a check for damage > 0, so that if not the plugin will not even
damage the entity, preventing the red flash and knockback receiving 0
damage would cause.
2015-02-07 14:26:10 -05:00
Brendan Wilson
792bfa70ca Added a configuration option for HCD
HorizontalCollisionDamage will not activate if the corresponding
configuration node is set to false.

Also changed the Bloodbending-at-any-time message in /pk who for better
looks.
2015-02-07 14:22:47 -05:00
Brendan Wilson
6bc5d6ade0 Fixed duplicate instances occuring in the HCS 2015-02-06 11:20:37 -05:00
Brendan Wilson
fa77e46c3e Fixed a typo in HorizontalVelocityChangeEvent
`getDistanceTravelled()` was renamed to `getDistanceTraveled()` to
respect proper English spelling.
2015-02-05 17:56:54 -05:00
Brendan Wilson
b67d3d2e0a Revert "Revert "Modified the HorizontalCollision damage calculation.""
This reverts commit 31cbac3666.
2015-02-05 17:42:53 -05:00
Brendan Wilson
31cbac3666 Revert "Modified the HorizontalCollision damage calculation."
This reverts commit 675200ccd1.
2015-02-05 17:38:41 -05:00
Brendan Wilson
675200ccd1 Modified the HorizontalCollision damage calculation.
Instead of solely relying on delta velocity, the equation now
incorporates a configurable minimum distance to give damage and also
gives the distance travelled a say.
2015-02-05 17:38:21 -05:00
Brendan Wilson
a8794eab6b Made a few changes to the Wall Damage System
Airblast will no longer crash when it gets to invoking a
HorizontalVelocityTracker.
The HorizontalVelocityTracker now cancels if the entity comes in contact
with water.
The HorizontalVelocityChangeEvent listener in PKListener now only works
if the entity's ID is NOT the same as the instigator's.
2015-02-05 13:43:04 -05:00
MistPhizzle
43a560d912 1.6.0 BETA 14 2015-02-04 22:40:53 -05:00
MistPhizzle
b252fa98d8 Merge pull request #96 from jedk1/master
Quick Database name change fix
2015-02-04 22:37:35 -05:00
MistPhizzle
dea1d28ffd Merge pull request #93 from Carbogen/master
Added Wall Damage and made some abilities detectable through the API
2015-02-04 22:37:27 -05:00
Brendan Wilson
84b6eee8ad Added check in Bloodbending
Made it so that daytime bloodbenders can bloodbend other bloodbenders so
long as they can't also bloodbend during the day.
2015-02-04 18:15:26 -05:00
Brendan Wilson
d63db2e235 Merge branch 'master' of https://github.com/ProjectKorra/ProjectKorra
Conflicts:
	src/com/projectkorra/ProjectKorra/Methods.java
	src/com/projectkorra/ProjectKorra/firebending/Lightning.java
2015-02-04 17:25:51 -05:00
Brendan Wilson
973c39eec3 Fixed an incorrect if statement in Methods
It checked if a player HAD their bending toggled in order to resist
Bloodbending.
2015-02-04 17:16:48 -05:00
jedk1
e9b4c851e4 Added log for name changes.
Added line so it logs name change updates to console.
2015-02-04 17:16:20 +00:00
jedk1
18f5655d2d Added log message for name changes. 2015-02-04 17:15:45 +00:00
jedk1
960e3a5415 Changed 2 lines to fix the name change update. 2015-02-04 16:52:33 +00:00
Brendan Wilson
2ff4484394 Fixed some errors with wall damage. 2015-02-03 21:22:30 -05:00
Brendan Wilson
bc135c6f12 Added a Bloodbending at anytime permission
Title says it all
2015-02-03 18:17:25 -05:00
Brendan Wilson
9628b31ada Fixed Torrent API Reachability 2015-02-02 19:06:21 -05:00
Brendan Wilson
ad66632bf3 Modified BloodBending's aiming
BloodBending no longer throws an entity in an incorrect direction if the
entity's position hasn't updated after you moved right before you
clicked.
2015-02-02 17:50:07 -05:00
Brendan Wilson
03484854d4 Revert "Removed fireblast furnace ignition"
This reverts commit 1945040515.

Conflicts:
	.idea/workspace.xml
2015-02-02 17:26:50 -05:00
Brendan Wilson
046d1fd0f5 Optimized Bloodbending a bit
If you were to bloodbend an entity initially close to you, the distance
between you and that entity while bloodbending would be the same. This
made throwing difficult as if you were to hit the entity (because it's
within arm range) the move wouldn't work. I set the distance value to 6,
so that when you Bloodbend an entity the distance between it and
yourself is always 6 unless you point at a wall or the floor.
2015-02-02 17:18:43 -05:00
Brendan Wilson
8ac15b4710 Added configuration option for WaterSpout particles
Default to FALSE, a server admin can choose whether or not their server
has waterspout particles.
2015-02-02 17:02:39 -05:00
Brendan Wilson
3f3f75b90d Fixed a bug with Horizontal Velocities
Fixed Bug: Entities would also take damage when accelerating really
fast. This was fixed to work only when a) the entity is DECELERATING and
b) when there is a non-air block within 2 blocks of the entity.
2015-02-02 16:23:10 -05:00
Brendan Wilson
e9e07f4270 WALL DAMAGE
Added a method of tracking wall damage on entities. This is currently
used only for Airblast and Bloodbending, but includes Airburst as it is,
to my understanding, an array of Airblasts.
2015-02-02 14:37:13 -05:00
MistPhizzle
9e8a8376f4 1.6.0 BETA 13 2015-02-01 18:57:35 -05:00
MistPhizzle
68309215ed Merge pull request #94 from nathank33/master
Suffocation Rework and Bug Fixes
2015-02-01 18:54:47 -05:00
nathank33
3d01b3fd05 LavaFlow: RemoveAll bug fix, Code cleanup 2015-02-01 11:16:50 -08:00
nathank33
326d37f28a LavaFlow: Moved everything to instance variables, and cleaned up
Lightning: Code cleanup
2015-02-01 11:16:18 -08:00