80 lines
4.8 KiB
Diff
80 lines
4.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Aikar <aikar@aikar.co>
|
||
|
Date: Sun, 14 Jan 2018 17:36:02 -0500
|
||
|
Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
|
||
|
|
||
|
This event can be used for when you want to exclude a certain player
|
||
|
from triggering monster spawns on a server.
|
||
|
|
||
|
Also a highly more effecient way to blanket block spawns in a world
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
|
||
|
index 3351c6bcc5244fd7565ba7af08f63ea4d999ce97..677c185aca2cdd64bead9dbed147a87c5bcf1678 100644
|
||
|
--- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
|
||
|
+++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
|
||
|
@@ -611,6 +611,15 @@ public class ChunkProviderServer extends IChunkProvider {
|
||
|
this.world.getMethodProfiler().exit();
|
||
|
//List<PlayerChunk> list = Lists.newArrayList(this.playerChunkMap.f()); // Paper
|
||
|
//Collections.shuffle(list); // Paper
|
||
|
+ //Paper start - call player naturally spawn event
|
||
|
+ int chunkRange = world.spigotConfig.mobSpawnRange;
|
||
|
+ chunkRange = (chunkRange > world.spigotConfig.viewDistance) ? (byte) world.spigotConfig.viewDistance : chunkRange;
|
||
|
+ chunkRange = Math.min(chunkRange, 8);
|
||
|
+ for (EntityPlayer entityPlayer : this.world.getPlayers()) {
|
||
|
+ entityPlayer.playerNaturallySpawnedEvent = new com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent(entityPlayer.getBukkitEntity(), (byte) chunkRange);
|
||
|
+ entityPlayer.playerNaturallySpawnedEvent.callEvent();
|
||
|
+ };
|
||
|
+ // Paper end
|
||
|
this.world.timings.chunkTicks.startTiming(); // Paper
|
||
|
this.playerChunkMap.f().forEach((playerchunk) -> { // Paper - no... just no...
|
||
|
Optional<Chunk> optional = ((Either) playerchunk.a().getNow(PlayerChunk.UNLOADED_CHUNK)).left();
|
||
|
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
index 5b2ae94ed7d499e401a058691eb6ed413b626150..de7167ddf7b36ef266e511187789f99244401c21 100644
|
||
|
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
@@ -1,5 +1,6 @@
|
||
|
package net.minecraft.server.level;
|
||
|
|
||
|
+import com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent;
|
||
|
import com.google.common.collect.Lists;
|
||
|
import com.mojang.authlib.GameProfile;
|
||
|
import com.mojang.datafixers.util.Either;
|
||
|
@@ -228,6 +229,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||
|
public boolean sentListPacket = false;
|
||
|
public Integer clientViewDistance;
|
||
|
// CraftBukkit end
|
||
|
+ public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
|
||
|
|
||
|
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> cachedSingleHashSet; // Paper
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
|
||
|
index 1d71a19a7bbe463f537861531113dd1ed3e5b977..d1e45dfb99074ec027d4f943391a024c726d93b2 100644
|
||
|
--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
|
||
|
+++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
|
||
|
@@ -966,12 +966,23 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
||
|
chunkRange = (chunkRange > world.spigotConfig.viewDistance) ? (byte) world.spigotConfig.viewDistance : chunkRange;
|
||
|
chunkRange = (chunkRange > 8) ? 8 : chunkRange;
|
||
|
|
||
|
- double blockRange = (reducedRange) ? Math.pow(chunkRange << 4, 2) : 16384.0D;
|
||
|
+ final int finalChunkRange = chunkRange; // Paper for lambda below
|
||
|
+ //double blockRange = (reducedRange) ? Math.pow(chunkRange << 4, 2) : 16384.0D; // Paper - use from event
|
||
|
// Spigot end
|
||
|
long i = chunkcoordintpair.pair();
|
||
|
|
||
|
return !this.chunkDistanceManager.d(i) ? true : this.playerMap.a(i).noneMatch((entityplayer) -> {
|
||
|
- return !entityplayer.isSpectator() && a(chunkcoordintpair, (Entity) entityplayer) < blockRange; // Spigot
|
||
|
+ // Paper start -
|
||
|
+ com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent event;
|
||
|
+ double blockRange = 16384.0D;
|
||
|
+ if (reducedRange) {
|
||
|
+ event = entityplayer.playerNaturallySpawnedEvent;
|
||
|
+ if (event == null || event.isCancelled()) return false;
|
||
|
+ blockRange = (double) ((event.getSpawnRadius() << 4) * (event.getSpawnRadius() << 4));
|
||
|
+ }
|
||
|
+
|
||
|
+ return (!entityplayer.isSpectator() && a(chunkcoordintpair, (Entity) entityplayer) < blockRange); // Spigot
|
||
|
+ // Paper end
|
||
|
});
|
||
|
}
|
||
|
|