Commit graph

1680 commits

Author SHA1 Message Date
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
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
OmniCypher
877d4ff114 Merge pull request #283 from Simplicitee/patch-21
Fix message
2015-11-07 13:47:09 -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
OmniCypher
fca6ed2066 Merge pull request #280 from Simplicitee/patch-19
Fix Element Toggle
2015-11-07 10:29:37 -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
OmniCypher
70df0d52ae Merge pull request #273 from Simplicitee/patch-12
Add import
2015-11-06 19:18:37 -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
OmniCypher
80ef1ba645 Merge pull request #270 from Simplicitee/patch
General fixes and Additions
2015-10-25 14:40:57 -07:00
Benford
b5112874af Merge remote-tracking branch 'origin/patch' into patch 2015-10-25 12:41:57 -04:00
Benford
093fd0854d Merge remote-tracking branch 'ProjectKorra/master' into patch 2015-10-25 12:39:06 -04:00
Benford
11c0bf6329 General fixes and new additions 2015-10-25 12:03:15 -04:00
OmniCypher
ffc0ba9a3a Merge pull request #269 from StrangeOne101/master
Fix WaterSpout Bugs
2015-10-17 18:16:29 -07: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