Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-02 14:38:26 +01:00
Code Issues Projects Releases Wiki Activity

Style cleanup

Browse Source
This commit is contained in:
TheMode 2021-08-15 17:50:38 +02:00
parent d53d2ecea5
commit b6ab689b10
2 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/net/minestom/server/instance/Instance.java
View File

@ -447,8 +447,7 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
* @return an unmodifiable {@link Set} containing all the players in the instance
*/
@Override
@NotNull
public Set<Player> getPlayers() {
public @NotNull Set<@NotNull Player> getPlayers() {
return Collections.unmodifiableSet(players);
}
@ -457,8 +456,7 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
*
* @return an unmodifiable {@link Set} containing all the creatures in the instance
*/
@NotNull
public Set<EntityCreature> getCreatures() {
public @NotNull Set<@NotNull EntityCreature> getCreatures() {
return Collections.unmodifiableSet(creatures);
}
@ -467,8 +465,7 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
*
* @return an unmodifiable {@link Set} containing all the experience orbs in the instance
*/
@NotNull
public Set<ExperienceOrb> getExperienceOrbs() {
public @NotNull Set<@NotNull ExperienceOrb> getExperienceOrbs() {
return Collections.unmodifiableSet(experienceOrbs);
}
@ -479,7 +476,7 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
* @return an unmodifiable {@link Set} containing all the entities in a chunk,
* if {@code chunk} is unloaded, return an empty {@link HashSet}
*/
public @NotNull Set<Entity> getChunkEntities(Chunk chunk) {
public @NotNull Set<@NotNull Entity> getChunkEntities(Chunk chunk) {
if (!ChunkUtils.isLoaded(chunk))
return Collections.emptySet();
final Set<Entity> entities;
@ -587,7 +584,7 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
// Load the chunk if not already (or throw an error if auto chunk load is disabled)
loadOptionalChunk(entityPosition).thenAccept(chunk -> {
Check.notNull(chunk, "You tried to spawn an entity in an unloaded chunk, " + entityPosition);
Check.notNull(chunk, "You tried to spawn an entity in an unloaded chunk, {0}", entityPosition);
UNSAFE_addEntityToChunk(entity, chunk);
});
});
@ -602,10 +599,7 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
*/
@ApiStatus.Internal
public void UNSAFE_removeEntity(@NotNull Entity entity) {
final Instance entityInstance = entity.getInstance();
if (entityInstance != this)
return;
if (entity.getInstance() != this) return;
RemoveEntityFromInstanceEvent event = new RemoveEntityFromInstanceEvent(this, entity);
EventDispatcher.callCancellable(event, () -> {
// Remove this entity from players viewable list and send delete entities packet
@ -697,31 +691,24 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
callback.accept(this);
}
}
// Time
{
this.worldAge++;
this.time += timeRate;
// time needs to be send to players
// time needs to be sent to players
if (timeUpdate != null && !Cooldown.hasCooldown(time, lastTimeUpdate, timeUpdate)) {
PacketUtils.sendGroupedPacket(getPlayers(), createTimePacket());
this.lastTimeUpdate = time;
}
}
// Tick event
{
// Process tick events
InstanceTickEvent chunkTickEvent = new InstanceTickEvent(this, time, lastTickAge);
EventDispatcher.call(chunkTickEvent);
EventDispatcher.call(new InstanceTickEvent(this, time, lastTickAge));
// Set last tick age
lastTickAge = time;
this.lastTickAge = time;
}
this.worldBorder.update();
}
@ -776,8 +763,7 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
*
* @return the instance explosion supplier, null if none was provided
*/
@Nullable
public ExplosionSupplier getExplosionSupplier() {
public @Nullable ExplosionSupplier getExplosionSupplier() {
return explosionSupplier;
}
@ -797,8 +783,8 @@ public abstract class Instance implements BlockGetter, BlockSetter, Tickable, Ta
*
* @return the instance space
*/
@NotNull
public PFInstanceSpace getInstanceSpace() {
@ApiStatus.Internal
public @NotNull PFInstanceSpace getInstanceSpace() {
return instanceSpace;
}

8
src/main/java/net/minestom/server/instance/InstanceContainer.java
View File

@ -82,7 +82,7 @@ public class InstanceContainer extends Instance {
}
@Override
public synchronized void setBlock(int x, int y, int z, @NotNull Block block) {
public void setBlock(int x, int y, int z, @NotNull Block block) {
final Chunk chunk = getChunkAt(x, z);
if (ChunkUtils.isLoaded(chunk)) {
UNSAFE_setBlock(chunk, x, y, z, block, null, null);
@ -106,8 +106,8 @@ public class InstanceContainer extends Instance {
* @param z the block Z
* @param block the block to place
*/
private void UNSAFE_setBlock(@NotNull Chunk chunk, int x, int y, int z, @NotNull Block block,
@Nullable BlockHandler.Placement placement, @Nullable BlockHandler.Destroy destroy) {
private synchronized void UNSAFE_setBlock(@NotNull Chunk chunk, int x, int y, int z, @NotNull Block block,
@Nullable BlockHandler.Placement placement, @Nullable BlockHandler.Destroy destroy) {
if (chunk.isReadOnly()) return;
synchronized (chunk) {
// Refresh the last block change time
@ -261,7 +261,9 @@ public class InstanceContainer extends Instance {
CompletableFuture<Chunk> completableFuture = new CompletableFuture<>();
final IChunkLoader loader = chunkLoader;
final Runnable retriever = () -> loader.loadChunk(this, chunkX, chunkZ)
// create the chunk from scratch (with the generator) if the loader couldn't
.thenCompose(chunk -> chunk != null ? CompletableFuture.completedFuture(chunk) : createChunk(chunkX, chunkZ))
// cache the retrieved chunk (in the next instance tick for thread-safety)
.whenComplete((chunk, throwable) -> scheduleNextTick(instance -> {
cacheChunk(chunk);
EventDispatcher.call(new InstanceChunkLoadEvent(this, chunkX, chunkZ));