mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-01 20:52:12 -07:00
Update upstream CB
This commit is contained in:
@@ -1,28 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alfie Cleveland <alfeh@me.com>
|
|
||||||
Date: Sun, 27 Nov 2016 22:17:37 +0000
|
|
||||||
Subject: [PATCH] Don't process packets from offline players
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
||||||
@@ -0,0 +0,0 @@ import javax.annotation.Nullable;
|
|
||||||
// CraftBukkit start
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftItem;
|
|
||||||
+import org.bukkit.craftbukkit.entity.CraftPlayer; // Paper
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.entity.EntityCombustByEntityEvent;
|
|
||||||
import org.bukkit.event.player.PlayerBedEnterEvent;
|
|
||||||
@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
|
|
||||||
}
|
|
||||||
|
|
||||||
protected boolean isFrozen() {
|
|
||||||
- return this.getHealth() <= 0.0F || this.isSleeping();
|
|
||||||
+ return this.getHealth() <= 0.0F || this.isSleeping() || (this.bukkitEntity != null && this.bukkitEntity instanceof CraftPlayer && !((CraftPlayer) this.bukkitEntity).isOnline()); // Paper - Pull #517
|
|
||||||
}
|
|
||||||
|
|
||||||
public void closeInventory() {
|
|
||||||
--
|
|
Submodule work/CraftBukkit updated: 41ade2f291...fffaf07113
Reference in New Issue
Block a user