caskd
/
kami-blue
forked from RepoMirrors/kami-blue
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix changes that were reverted by credits fix

This commit is contained in:
Bella 2020-04-18 11:47:44 -04:00
parent 7c4b26a3d2
commit e4326255fc
No known key found for this signature in database
GPG Key ID: DBD4A6030080C8B3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/me/zeroeightsix/kami/command/commands/CreditsCommand.java
View File

@ -9,7 +9,7 @@ import java.util.List;
import static me.zeroeightsix.kami.util.MessageSendHelper.sendChatMessage;
/**
* Created by S-B99 on 01/12/2019.
* Created by dominikaaaa on 01/12/2019.
* Revamped by d1gress/Qther on 13 April 2020
*/
@ -23,7 +23,7 @@ public class CreditsCommand extends Command {
@Override
public void call(String[] args) {
List<Integer> exceptions = Arrays.asList(
17222512, // s-b99 / dominika
17222512, // dominikaaaa / dominika
27009727, // zeroeightysix
48992448, // blockparole
19880089, // EmotionalLove
@ -46,7 +46,7 @@ public class CreditsCommand extends Command {
"\n&l&9Author:" +
"\n086 (zeroeightysix)" +
"\n&l&9Contributors:" +
"\nBella (S-B99)" +
"\nDominika (dominikaaaa)" +
"\nhub (blockparole)" +
"\nSasha (EmotionalLove)" +
"\nQther (d1gress / Vonr)" +

4
src/main/java/me/zeroeightsix/kami/command/commands/EntityStatsCommand.java
View File

@ -7,6 +7,7 @@ import net.minecraft.entity.passive.AbstractHorse;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Objects;
import static me.zeroeightsix.kami.util.MessageSendHelper.sendChatMessage;
@ -27,7 +28,6 @@ public class EntityStatsCommand extends Command {
if (mc.player.getRidingEntity() != null && mc.player.getRidingEntity() instanceof AbstractHorse) {
AbstractHorse horse = (AbstractHorse) mc.player.getRidingEntity();
// TODO: Function that resolves UUID's to Minecraft usernames. @bella
float maxHealth = horse.getMaxHealth();
double speed = round(43.17 * horse.getAIMoveSpeed(), 2);
double jump = round(-0.1817584952 * Math.pow(horse.getHorseJumpStrength(), 3) + 3.689713992 * Math.pow(horse.getHorseJumpStrength(), 2) + 2.128599134 * horse.getHorseJumpStrength() - 0.343930367, 4);
@ -36,7 +36,7 @@ public class EntityStatsCommand extends Command {
String builder = "&6Entity Statistics:" + "\n&cMax Health: " + maxHealth +
"\n&cSpeed: " + speed +
"\n&cJump: " + jump +
"\n&cOwner: " + EntityUtil.getNameFromUUID(ownerId).replace("\"", "");
"\n&cOwner: " + Objects.requireNonNull(EntityUtil.getNameFromUUID(ownerId)).replace("\"", "");
sendChatMessage(builder);
} else if (mc.player.getRidingEntity() instanceof EntityLivingBase) {
EntityLivingBase entity = (EntityLivingBase) mc.player.getRidingEntity();