2019-06-25 03:47:58 +02:00
|
|
|
From 38ed795fadbf5334cbdca6de8d6e4c496ce3fa56 Mon Sep 17 00:00:00 2001
|
2019-04-28 19:59:47 +02:00
|
|
|
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/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
2019-06-25 03:47:58 +02:00
|
|
|
index 6960e46ec6..1212f3f67d 100644
|
2019-04-28 19:59:47 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
2019-06-25 03:47:58 +02:00
|
|
|
@@ -755,12 +755,24 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
2019-04-28 19:59:47 +02:00
|
|
|
chunkRange = (chunkRange > world.spigotConfig.viewDistance) ? (byte) world.spigotConfig.viewDistance : chunkRange;
|
|
|
|
chunkRange = (chunkRange > 8) ? 8 : chunkRange;
|
2019-05-31 01:54:25 +02:00
|
|
|
|
|
|
|
- double blockRange = (reducedRange) ? Math.pow(chunkRange << 4, 2) : 16384.0D;
|
2019-04-28 19:59:47 +02:00
|
|
|
+ final int finalChunkRange = chunkRange; // Paper for lambda below
|
2019-05-31 01:54:25 +02:00
|
|
|
+ //double blockRange = (reducedRange) ? Math.pow(chunkRange << 4, 2) : 16384.0D; // Paper - use from event
|
2019-04-28 19:59:47 +02:00
|
|
|
// Spigot end
|
2019-06-25 03:47:58 +02:00
|
|
|
long i = chunkcoordintpair.pair();
|
2019-04-28 19:59:47 +02:00
|
|
|
|
2019-06-25 03:47:58 +02:00
|
|
|
return !this.u.d(i) ? true : this.playerMap.a(i).noneMatch((entityplayer) -> {
|
2019-05-13 00:34:42 +02:00
|
|
|
- return !entityplayer.isSpectator() && a(chunkcoordintpair, (Entity) entityplayer) < blockRange; // Spigot
|
2019-04-28 19:59:47 +02:00
|
|
|
+ // Paper start -
|
2019-06-06 07:13:00 +02:00
|
|
|
+ com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent event;
|
|
|
|
+ double blockRange = 16384.0D;
|
|
|
|
+ if (reducedRange) {
|
|
|
|
+ event = new com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent(entityplayer.getBukkitEntity(), (byte) finalChunkRange);
|
2019-06-11 03:45:46 +02:00
|
|
|
+ event.callEvent();
|
2019-06-06 07:13:00 +02:00
|
|
|
+ blockRange = (double) ((event.getSpawnRadius() << 4) * (event.getSpawnRadius() << 4));
|
|
|
|
+ if (event.isCancelled()) return true;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return (!entityplayer.isSpectator() && a(chunkcoordintpair, (Entity) entityplayer) < blockRange); // Spigot
|
2019-04-28 19:59:47 +02:00
|
|
|
+ // Paper end
|
|
|
|
});
|
|
|
|
}
|
2019-05-13 00:34:42 +02:00
|
|
|
|
2019-04-28 19:59:47 +02:00
|
|
|
--
|
2019-06-25 03:47:58 +02:00
|
|
|
2.22.0
|
2019-04-28 19:59:47 +02:00
|
|
|
|