Revert "bed tweaks! no more natural regen, be careful with your bed"
This reverts commit 5f1f713907
.
This commit is contained in:
parent
5f1f713907
commit
39fa67e481
|
@ -2,29 +2,22 @@ package engineering.wolfgirl.vfo;
|
|||
|
||||
import com.flowpowered.math.vector.Vector3d;
|
||||
import org.spongepowered.api.Sponge;
|
||||
import org.spongepowered.api.block.BlockType;
|
||||
import org.spongepowered.api.block.BlockTypes;
|
||||
import org.spongepowered.api.data.key.Keys;
|
||||
import org.spongepowered.api.entity.living.player.Player;
|
||||
import org.spongepowered.api.event.action.SleepingEvent;
|
||||
import org.spongepowered.api.event.cause.EventContextKeys;
|
||||
import org.spongepowered.api.event.cause.entity.spawn.SpawnTypes;
|
||||
import org.spongepowered.api.event.entity.SpawnEntityEvent;
|
||||
import org.spongepowered.api.event.block.ChangeBlockEvent;
|
||||
import org.spongepowered.api.event.entity.living.humanoid.player.RespawnPlayerEvent;
|
||||
import org.spongepowered.api.event.filter.cause.First;
|
||||
import org.spongepowered.api.event.item.inventory.DropItemEvent;
|
||||
import org.spongepowered.api.plugin.Plugin;
|
||||
import org.spongepowered.api.event.Listener;
|
||||
import org.spongepowered.api.event.game.state.GameStartedServerEvent;
|
||||
import org.spongepowered.api.world.LocatableBlock;
|
||||
import org.spongepowered.api.world.Location;
|
||||
import org.spongepowered.api.world.World;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import org.slf4j.Logger;
|
||||
import org.spongepowered.api.world.storage.WorldProperties;
|
||||
|
||||
import java.awt.event.ItemEvent;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
|
||||
|
@ -36,10 +29,6 @@ public class VFO {
|
|||
@Listener
|
||||
public void onServerStart(GameStartedServerEvent event) {
|
||||
logger.info("VFO enabled");
|
||||
|
||||
for (World world : Sponge.getGame().getServer().getWorlds()) {
|
||||
world.getProperties().setGameRule("naturalRegeneration", "false");
|
||||
}
|
||||
}
|
||||
|
||||
@Listener
|
||||
|
@ -71,21 +60,4 @@ public class VFO {
|
|||
player.offer(Keys.HEALTH, player.get(Keys.MAX_HEALTH).orElse(20.0));
|
||||
}
|
||||
|
||||
// ??? breaking the foot of a bed wont fire a DropItemEvent
|
||||
@Listener
|
||||
public void onBreak(SpawnEntityEvent event) {
|
||||
if (event.getContext().get(EventContextKeys.SPAWN_TYPE).get() == SpawnTypes.BLOCK_SPAWNING) {
|
||||
if (event.getCause().first(LocatableBlock.class).get().getBlockState().getType() == BlockTypes.BED) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ... and breaking the head wont fire a SpawnEntityEvent
|
||||
@Listener
|
||||
public void onBreak(DropItemEvent.Destruct event) {
|
||||
if (event.getContext().get(EventContextKeys.BLOCK_HIT).get().getState().getType() == BlockTypes.BED) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue