updated for spigot

master
Benjamin Kraft 3 years ago
parent 0b379a3c3a
commit ce39b12abc
  1. 2
      Sharehealth.iml
  2. 2
      scripts/start_server.sh
  3. 15
      src/main/java/com/benjocraeft/sharehealth/Messenger.java

@ -23,7 +23,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc.paper:paper-api:1.18.1-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:31.0.1-jre" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
@ -51,5 +50,6 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-commons:9.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-tree:9.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-analysis:9.2" level="project" />
<orderEntry type="library" name="spigot-api-1.18.1-R0.1-SNAPSHOT" level="project" />
</component>
</module>

@ -1,2 +1,2 @@
cd server || exit
java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar paper.jar nogui
java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar spigot.jar nogui

@ -1,6 +1,5 @@
package com.benjocraeft.sharehealth;
import net.kyori.adventure.text.TextComponent;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.block.Block;
@ -42,7 +41,7 @@ public class Messenger {
}
void sendFailedMessage(Player cause){
String playerName = ((TextComponent) cause.displayName()).content();
String playerName = getPlayerName(cause);
String message = "Mission failed, go next! CAUSE: " + ChatColor.RED + playerName;
Bukkit.getOnlinePlayers().forEach(p -> p.sendMessage(message));
}
@ -98,7 +97,7 @@ public class Messenger {
}
private String damageMessage(Player player, double damage, String source){
String playerS = ((TextComponent) player.displayName()).content();
String playerS = getPlayerName(player);
String damageS = String.format("%.2f", damage / 2);
return ChatColor.BLUE + playerS
+ ChatColor.WHITE + " - "
@ -108,7 +107,7 @@ public class Messenger {
}
private String healMessage(Player player, double regainedHealth, RegainReason reason){
String playerS = ((TextComponent) player.displayName()).content();
String playerS = getPlayerName(player);
String healingS = String.format("%.2f", regainedHealth / 2);
String causeS = reason.toString();
return ChatColor.BLUE + playerS
@ -150,4 +149,12 @@ public class Messenger {
return helpMessage.toString();
}
private String getPlayerName(Player player){
//Papermc:
//((TextComponent) player.displayName()).content();
//Spigot:
return player.getDisplayName();
}
}

Loading…
Cancel
Save