JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cosmetic fixes

Browse Source
This commit is contained in:
Cheese 2015-11-29 11:40:19 +11:00
parent 51227ae4f3
commit 5cefe27257
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemTNT.java
View File

@ -70,7 +70,7 @@ public class ItemTNT extends ItemGadget
double mult = players.get(player);
//Knockback
UtilAction.velocity(player, UtilAlg.getTrajectory(event.getLocation(), player.getLocation()), 3 * mult, false, 0, 0.5 + 2 * mult, 10, true);
UtilAction.velocity(player, UtilAlg.getTrajectory(event.getLocation(), player.getLocation()), 2 * mult, false, 0, 0.5 + 1 * mult, 10, true);
}
// Simulating explosion to prevent water from being evaporated.

7
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphTitan.java
View File

@ -138,8 +138,8 @@ public class MorphTitan extends MorphGadget
{
UtilParticle.PlayParticle(ParticleType.HUGE_EXPLOSION, stand.getLocation(), 3f, 3f, 3f, 0, 32, ViewDist.MAX, UtilServer.getPlayers());
HashMap<LivingEntity, Double> players = UtilEnt.getInRadius(stand.getLocation(), 12);
for (Entity ent : players.keySet())
HashMap<Player, Double> players = UtilPlayer.getInRadius(stand.getLocation(), 12d);
for (Player ent : players.keySet())
{
if (ent instanceof Player)
if (Manager.collideEvent(this, (Player)ent))
@ -148,7 +148,7 @@ public class MorphTitan extends MorphGadget
double mult = players.get(ent);
//Knockback
UtilAction.velocity(ent, UtilAlg.getTrajectory(stand.getLocation(), ent.getLocation()), 4 * mult, false, 0, 1 + 3 * mult, 10, true);
UtilAction.velocity(ent, UtilAlg.getTrajectory(stand.getLocation(), ent.getLocation()), 3 * mult, false, 0, 1 + 2 * mult, 10, true);
}
//Sound
@ -239,3 +239,4 @@ public class MorphTitan extends MorphGadget
}
}
}
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleLegend.java
View File

@ -26,7 +26,7 @@ public class ParticleLegend extends ParticleGadget
" ",
C.cGreen + "Unlocked with Legend Rank",
},
-2,
-3,
Material.ENDER_PORTAL_FRAME, (byte)0);
}

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleTitan.java
View File

@ -37,12 +37,12 @@ public class ParticleTitan extends ParticleGadget
super(manager, "Flame of the Titans", new String[]
{
C.cWhite + "These flames are said to be the",
C.cWhite + "souls of an lost civilisation of",
C.cWhite + "souls of a lost civilisation of",
C.cWhite + "Titans, forgotten by time.",
" ",
C.cRed + "Unlocked with Titan Rank",
},
-2,
-3,
Material.FIREBALL, (byte)0);
}