Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Style cleanup + increase food saturation limit to 20

This commit is contained in:
themode 2021-03-21 19:47:22 +01:00
parent 510f8d7733
commit b6d8dd9f73
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/net/minestom/server/entity/Player.java
View File

@ -123,10 +123,14 @@ public class Player extends LivingEntity implements CommandSender {
// CustomBlock break delay
private CustomBlock targetCustomBlock;
private BlockPosition targetBlockPosition;
private long targetBreakDelay; // The last break delay requested
private long targetBlockBreakCount; // Number of tick since the last stage change
private byte targetStage; // The current stage of the target block, only if multi player breaking is disabled
private final Set<Player> targetBreakers = Collections.singleton(this); // Only used if multi player breaking is disabled, contains only this player
// The last break delay requested
private long targetBreakDelay;
// Number of tick since the last stage change
private long targetBlockBreakCount;
// The current stage of the target block, only if multi player breaking is disabled
private byte targetStage;
// Only used if multi player breaking is disabled, contains only this player
private final Set<Player> targetBreakers = Collections.singleton(this);
// Position synchronization with viewers
private long lastPlayerSynchronizationTime;
@ -319,7 +323,7 @@ public class Player extends LivingEntity implements CommandSender {
// Should increment the target block stage
if (targetCustomBlock.enableMultiPlayerBreaking()) {
// Let the custom block object manages the breaking
final boolean canContinue = this.targetCustomBlock.processStage(instance, targetBlockPosition, this, stageIncrease);
final boolean canContinue = targetCustomBlock.processStage(instance, targetBlockPosition, this, stageIncrease);
if (canContinue) {
final Set<Player> breakers = targetCustomBlock.getBreakers(instance, targetBlockPosition);
refreshBreakDelay(breakers);
@ -632,7 +636,8 @@ public class Player extends LivingEntity implements CommandSender {
!spawnPosition.inSameChunk(this.position);
if (needWorldRefresh) {
final boolean firstSpawn = this.instance == null; // TODO: Handle player reconnections, must be false in that case too
// TODO: Handle player reconnections, must be false in that case too
final boolean firstSpawn = this.instance == null;
// Send the new dimension if player isn't in any instance or if the dimension is different
final DimensionType instanceDimensionType = instance.getDimensionType();
@ -811,7 +816,8 @@ public class Player extends LivingEntity implements CommandSender {
* @param volume the volume of the sound (1 is 100%)
* @param pitch the pitch of the sound, between 0.5 and 2.0
*/
public void playSound(@NotNull Sound sound, @NotNull SoundCategory soundCategory, int x, int y, int z, float volume, float pitch) {
public void playSound(@NotNull Sound sound, @NotNull SoundCategory soundCategory,
int x, int y, int z, float volume, float pitch) {
SoundEffectPacket soundEffectPacket = new SoundEffectPacket();
soundEffectPacket.soundId = sound.getId();
soundEffectPacket.soundCategory = soundCategory;
@ -828,7 +834,8 @@ public class Player extends LivingEntity implements CommandSender {
*
* @see #playSound(Sound, SoundCategory, int, int, int, float, float)
*/
public void playSound(@NotNull Sound sound, @NotNull SoundCategory soundCategory, BlockPosition position, float volume, float pitch) {
public void playSound(@NotNull Sound sound, @NotNull SoundCategory soundCategory,
BlockPosition position, float volume, float pitch) {
playSound(sound, soundCategory, position.getX(), position.getY(), position.getZ(), volume, pitch);
}
@ -843,7 +850,8 @@ public class Player extends LivingEntity implements CommandSender {
* @param volume the volume of the sound (1 is 100%)
* @param pitch the pitch of the sound, between 0.5 and 2.0
*/
public void playSound(@NotNull String identifier, @NotNull SoundCategory soundCategory, int x, int y, int z, float volume, float pitch) {
public void playSound(@NotNull String identifier, @NotNull SoundCategory soundCategory,
int x, int y, int z, float volume, float pitch) {
NamedSoundEffectPacket namedSoundEffectPacket = new NamedSoundEffectPacket();
namedSoundEffectPacket.soundName = identifier;
namedSoundEffectPacket.soundCategory = soundCategory;
@ -1100,7 +1108,8 @@ public class Player extends LivingEntity implements CommandSender {
* @throws IllegalArgumentException if {@code food} is not between 0 and 20
*/
public void setFood(int food) {
Check.argCondition(!MathUtils.isBetween(food, 0, 20), "Food has to be between 0 and 20");
Check.argCondition(!MathUtils.isBetween(food, 0, 20),
"Food has to be between 0 and 20");
this.food = food;
sendUpdateHealthPacket();
}
@ -1113,10 +1122,11 @@ public class Player extends LivingEntity implements CommandSender {
* Sets and refresh client food saturation.
*
* @param foodSaturation the food saturation
* @throws IllegalArgumentException if {@code foodSaturation} is not between 0 and 5
* @throws IllegalArgumentException if {@code foodSaturation} is not between 0 and 20
*/
public void setFoodSaturation(float foodSaturation) {
Check.argCondition(!MathUtils.isBetween(foodSaturation, 0, 5), "Food saturation has to be between 0 and 5");
Check.argCondition(!MathUtils.isBetween(foodSaturation, 0, 20),
"Food saturation has to be between 0 and 20");
this.foodSaturation = foodSaturation;
sendUpdateHealthPacket();
}
@ -1547,8 +1557,8 @@ public class Player extends LivingEntity implements CommandSender {
}
/**
* Refreshes the list of entities that the player should be able to see based on {@link MinecraftServer#getEntityViewDistance()}
* and {@link Entity#isAutoViewable()}.
* Refreshes the list of entities that the player should be able to see based
* on {@link MinecraftServer#getEntityViewDistance()} and {@link Entity#isAutoViewable()}.
*
* @param newChunk the new chunk of the player (can be the current one)
*/
@ -1702,7 +1712,8 @@ public class Player extends LivingEntity implements CommandSender {
* @param dimensionType the new player dimension
*/
protected void sendDimension(@NotNull DimensionType dimensionType) {
Check.argCondition(dimensionType.equals(getDimensionType()), "The dimension needs to be different than the current one!");
Check.argCondition(dimensionType.equals(getDimensionType()),
"The dimension needs to be different than the current one!");
this.dimensionType = dimensionType;
RespawnPacket respawnPacket = new RespawnPacket();
@ -1772,8 +1783,10 @@ public class Player extends LivingEntity implements CommandSender {
public void setTeam(Team team) {
super.setTeam(team);
if (team != null)
PacketUtils.sendGroupedPacket(MinecraftServer.getConnectionManager().getOnlinePlayers(), team.createTeamsCreationPacket());
if (team != null) {
var players = MinecraftServer.getConnectionManager().getOnlinePlayers();
PacketUtils.sendGroupedPacket(players, team.createTeamsCreationPacket());
}
}
/**