mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-17 20:25:13 +00:00
- Barrier Health Scaling with DBC Addon
- Healing Health Scaling with DBC Addon - Ki Attacks collided with Barriers - Remove Ability Slot (Deprecated) - Refactored Naming Scheme for Barrier Abilities - Fixed Player Settings for Ignore Dex, DBC Stats, etc.
This commit is contained in:
1 parent
3e58013ad6
commit
ecfedff9d2
25 files changed
+201
-276
No files matched your search
@@ -382,8 +382,8 @@ public class EntityAbilityLaser extends EntityEnergyProjectile {
|
||||
protected boolean checkBarrierCollision() {
|
||||
if (currentLength <= 0 || fullyExtended) return false;
|
||||
|
||||
List<EntityEnergyBarrier> barriers = EntityEnergyBarrier.getActiveBarriers(worldObj);
|
||||
for (EntityEnergyBarrier barrier : barriers) {
|
||||
List<EntityAbilityBarrier> barriers = EntityAbilityBarrier.getActiveBarriers(worldObj);
|
||||
for (EntityAbilityBarrier barrier : barriers) {
|
||||
if (barrier.isDead || barrier.isCharging()) continue;
|
||||
if (barrier.getOwnerEntityId() == this.ownerEntityId) continue;
|
||||
|
||||
@@ -396,8 +396,8 @@ public class EntityAbilityLaser extends EntityEnergyProjectile {
|
||||
}
|
||||
}
|
||||
|
||||
if (barrier instanceof EntityEnergyDome) {
|
||||
EntityEnergyDome dome = (EntityEnergyDome) barrier;
|
||||
if (barrier instanceof EntityAbilityDome) {
|
||||
EntityAbilityDome dome = (EntityAbilityDome) barrier;
|
||||
float intersectDist = getLineSphereIntersection(dome);
|
||||
if (intersectDist >= 0) {
|
||||
// Truncate laser at dome surface
|
||||
@@ -431,7 +431,7 @@ public class EntityAbilityLaser extends EntityEnergyProjectile {
|
||||
* Returns the distance along the laser direction to the first entry point,
|
||||
* or -1 if no intersection from outside.
|
||||
*/
|
||||
private float getLineSphereIntersection(EntityEnergyDome dome) {
|
||||
private float getLineSphereIntersection(EntityAbilityDome dome) {
|
||||
double cx = dome.posX;
|
||||
double cy = dome.posY;
|
||||
double cz = dome.posZ;
|
||||
|
||||
Reference in new issue
Block a user