mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 06:24:06 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From 401b647fb3a5dfb26cb51e184881fbefbcc68166 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 13 Apr 2016 00:30:10 -0400
|
|
Subject: [PATCH] Don't tick Skulls - unused code
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
|
|
index 99442bb130..177cceb77f 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntitySkull.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
|
|
@@ -24,7 +24,7 @@ import com.mojang.authlib.ProfileLookupCallback;
|
|
import java.util.concurrent.Callable;
|
|
// Spigot end
|
|
|
|
-public class TileEntitySkull extends TileEntity implements ITickable {
|
|
+public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Paper - remove tickable
|
|
|
|
public GameProfile gameProfile;
|
|
private int b;
|
|
@@ -124,7 +124,7 @@ public class TileEntitySkull extends TileEntity implements ITickable {
|
|
|
|
}
|
|
|
|
- @Override
|
|
+ // Paper - remove override
|
|
public void tick() {
|
|
Block block = this.getBlock().getBlock();
|
|
|
|
--
|
|
2.21.0
|
|
|