SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.14

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-25 12:00:00 +10:00
parent 5ea2a0e8e4
commit badc255efc
34 changed files with 172 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
paper-server/nms-patches/WorldServer.patch
View File

@@ -21,7 +21,7 @@
+
public class WorldServer extends World {
private static final Logger v = LogManager.getLogger();
private static final Logger LOGGER = LogManager.getLogger();
@@ -56,12 +71,31 @@
@Nullable
private final MobSpawnerTrader mobSpawnerTrader;
@@ -245,7 +245,7 @@
+ // CraftBukkit end
+
if (blockposition == null) {
WorldServer.v.warn("Unable to find spawn biome");
WorldServer.LOGGER.warn("Unable to find spawn biome");
}
@@ -638,6 +731,7 @@
ChunkProviderServer chunkproviderserver = this.getChunkProvider();
@@ -308,8 +308,8 @@
+ // CraftBukkit start
+ private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
if (entity.dead) {
- WorldServer.v.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType()));
+ // WorldServer.v.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
- WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType()));
+ // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
return false;
} else if (this.isUUIDTaken(entity)) {
return false;
@@ -325,8 +325,8 @@
if (entity1 == null) {
return false;
} else {
- WorldServer.v.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString());
+ // WorldServer.v.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString()); // CraftBukkit
- WorldServer.LOGGER.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString());
+ // WorldServer.LOGGER.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.getEntityType()), entity.getUniqueID().toString()); // CraftBukkit
return true;
}
}