Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-06 15:41:52 +00:00
Code Issues Releases Activity

Merge pull request #18 from WMGameLive/ver/1.21

Browse Source 
Fix MC-167242
This commit is contained in:
Artem Ostrasev
2024-07-21 15:31:33 +03:00
committed by GitHub
parent c997c7702d 5c48abdf58
commit 6186ead66d
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0058-Fix-MC-167242.patch Normal file
View File

@@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: WMGameLive <andu890201@gmail.com>
Date: Sun, 21 Jul 2024 19:36:01 +0800
Subject: [PATCH] Fix MC-167242
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 88972d9f07eb9088c139d9dbc974b2e61943f292..fc31f4e62f06e950b14a314838badcdf67836574 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -997,6 +997,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
world.addFreshEntityWithPassengers(entitywitch, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING);
// CraftBukkit end
this.releaseAllPois();
+
+ if(this.isSleeping()) {
+ this.stopSleeping();
+ }
+
this.discard(EntityRemoveEvent.Cause.TRANSFORMATION); // CraftBukkit - add Bukkit remove cause
} else {
super.thunderHit(world, lightning);