mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-09-18 21:33:01 +00:00
51 lines
2.7 KiB
Diff
51 lines
2.7 KiB
Diff
From 9b086aaca35f8ec737c07e0430ee9de6858e5b33 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <git@md-5.net>
|
|
Date: Sat, 14 Dec 2019 10:26:52 +1100
|
|
Subject: [PATCH] Add log-villager-deaths option
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
|
index fd5a7fdcf..824baa171 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
|
@@ -1610,7 +1610,7 @@ public abstract class EntityLiving extends Entity {
|
|
}
|
|
|
|
if (!this.level.isClientSide && this.hasCustomName()) {
|
|
- EntityLiving.LOGGER.info("Named entity {} died: {}", this, this.getCombatTracker().getDeathMessage().getString());
|
|
+ if (org.spigotmc.SpigotConfig.logNamedDeaths) EntityLiving.LOGGER.info("Named entity {} died: {}", this, this.getCombatTracker().getDeathMessage().getString()); // Spigot
|
|
}
|
|
|
|
this.dead = true;
|
|
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
|
|
index 79c058e50..cc75b1c06 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
|
|
@@ -652,7 +652,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
|
|
|
@Override
|
|
public void die(DamageSource damagesource) {
|
|
- EntityVillager.LOGGER.info("Villager {} died, message: '{}'", this, damagesource.getLocalizedDeathMessage(this).getString());
|
|
+ if (org.spigotmc.SpigotConfig.logVillagerDeaths) EntityVillager.LOGGER.info("Villager {} died, message: '{}'", this, damagesource.getLocalizedDeathMessage(this).getString()); // Spigot
|
|
Entity entity = damagesource.getEntity();
|
|
|
|
if (entity != null) {
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index c44267305..4abcb9ec0 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -386,4 +386,11 @@ public class SpigotConfig
|
|
disableAdvancementSaving = getBoolean("advancements.disable-saving", false);
|
|
disabledAdvancements = getList("advancements.disabled", Arrays.asList(new String[]{"minecraft:story/disabled"}));
|
|
}
|
|
+
|
|
+ public static boolean logVillagerDeaths;
|
|
+ public static boolean logNamedDeaths;
|
|
+ private static void logDeaths() {
|
|
+ logVillagerDeaths = getBoolean("settings.log-villager-deaths", true);
|
|
+ logNamedDeaths = getBoolean("settings.log-named-deaths", true);
|
|
+ }
|
|
}
|
|
--
|
|
2.34.1
|
|
|