mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2025-01-10 10:27:48 +01:00
784079fc31
* Drop useless stuff * Faster Random * TE opts * Patches.md * More Faster Random * Fix Build * More Opts * AirplaneLite * Update README.md removed TIC-TACS and adding AirplaneLite * Add AirplaneLite to the update script * Rebuild patches * Make enchanting table ticking configurable * AirplaneLite to commitUpstream.sh * Use FastRandom on more places Co-authored-by: Bud Gidiere <sgidiere@gmail.com> Co-authored-by: Simon Gardling <Titaniumtown@gmail.com>
28 lines
1.6 KiB
Diff
28 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
|
Date: Mon, 28 Sep 2020 16:25:34 +0300
|
|
Subject: [PATCH] PaperPR: Fix merging spawning values
|
|
|
|
This patch is licensed under bukkit's original license, GPLv3
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
|
index 6c15409982fd8005fede7c56c1ca74db5993d548..5e8c57aa026f5be735b0316da450b919692385f6 100644
|
|
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
|
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
|
@@ -157,9 +157,12 @@ public final class SpawnerCreature {
|
|
spawnercreature_d.a(entityinsentient, ichunkaccess);
|
|
},
|
|
difference, worldserver.paperConfig.perPlayerMobSpawns ? worldserver.getChunkProvider().playerChunkMap::updatePlayerMobTypeMap : null);
|
|
- spawnercreature_d.getEntityCountsByType().mergeInt(enumcreaturetype, spawnCount, (keyInMap, valueInMap) -> {
|
|
- return Integer.valueOf(spawnCount + valueInMap.intValue());
|
|
- });
|
|
+ // Yatopia start - fix this
|
|
+ //spawnercreature_d.getEntityCountsByType().mergeInt(enumcreaturetype, spawnCount, (keyInMap, valueInMap) -> {
|
|
+ // return Integer.valueOf(spawnCount + valueInMap.intValue());
|
|
+ //});
|
|
+ spawnercreature_d.getEntityCountsByType().mergeInt(enumcreaturetype, spawnCount, Integer::sum);
|
|
+ // Yatopia end
|
|
// Paper end - per player mob spawning
|
|
}
|
|
}
|