Update to MC 1.10.2
This commit is contained in:
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
- <artifactId>spigot-api</artifactId>
|
- <artifactId>spigot-api</artifactId>
|
||||||
+ <groupId>com.destroystokyo.paper</groupId>
|
+ <groupId>com.destroystokyo.paper</groupId>
|
||||||
+ <artifactId>paper-api</artifactId>
|
+ <artifactId>paper-api</artifactId>
|
||||||
<version>1.10-R0.1-SNAPSHOT</version>
|
<version>1.10.2-R0.1-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
- <name>Spigot-API</name>
|
- <name>Spigot-API</name>
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
Iterator iterator = entity.bx().iterator();
|
Iterator iterator = entity.bx().iterator();
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 1d47a117..f7d9a7c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
|
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
|
|
||||||
Date: Sat, 11 Jun 2016 14:59:15 -0500
|
|
||||||
Subject: [PATCH] MC-80966 - Always send chunk sections
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
|
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/ChunkSection.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/ChunkSection.java
|
|
||||||
@@ -0,0 +0,0 @@ public class ChunkSection {
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean a() {
|
|
||||||
- return this.nonEmptyBlockCount == 0;
|
|
||||||
+ // Paper - MC-80966
|
|
||||||
+ // Even if there are no blocks, there may be other information associated with the chunk, always send it.
|
|
||||||
+ return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean shouldTick() {
|
|
||||||
--
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Aikar <aikar@aikar.co>
|
|
||||||
Date: Mon, 16 May 2016 22:54:36 -0400
|
|
||||||
Subject: [PATCH] MC-99914 - ensure EntityItem loads before EntityPotion
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
|
||||||
@@ -0,0 +0,0 @@ public class EntityItem extends Entity {
|
|
||||||
this.setItemStack(itemstack);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ static int uglyHack = 1; // Paper - MC-99914 - ensure EntityItem loads before EntityPotion
|
|
||||||
protected boolean playStepSound() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
||||||
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
|
||||||
this.dataConverterManager = dataconvertermanager;
|
|
||||||
// CraftBukkit start
|
|
||||||
this.options = options;
|
|
||||||
+ EntityItem.uglyHack++; // Paper - MC-99914 - ensure EntityItem loads before EntityPotion
|
|
||||||
// Try to see if we're actually running in a terminal, disable jline if not
|
|
||||||
if (System.console() == null && System.getProperty("jline.terminal") == null) {
|
|
||||||
System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
|
|
||||||
--
|
|
||||||
@@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
+ <groupId>com.destroystokyo.paper</groupId>
|
+ <groupId>com.destroystokyo.paper</groupId>
|
||||||
+ <artifactId>paper</artifactId>
|
+ <artifactId>paper</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<version>1.10-R0.1-SNAPSHOT</version>
|
<version>1.10.2-R0.1-SNAPSHOT</version>
|
||||||
- <name>Spigot</name>
|
- <name>Spigot</name>
|
||||||
- <url>http://www.spigotmc.org</url>
|
- <url>http://www.spigotmc.org</url>
|
||||||
+ <name>Paper</name>
|
+ <name>Paper</name>
|
||||||
|
|||||||
@@ -35,14 +35,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; // Paper
|
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; // Paper
|
||||||
import org.apache.commons.lang3.ObjectUtils;
|
import org.apache.commons.lang3.ObjectUtils;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
public class DataWatcher {
|
import org.apache.logging.log4j.Logger;
|
||||||
|
@@ -0,0 +0,0 @@ public class DataWatcher {
|
||||||
private static final Map<Class<? extends Entity>, Integer> a = Maps.newHashMap();
|
private static final Logger a = LogManager.getLogger();
|
||||||
private final Entity b;
|
private static final Map<Class<? extends Entity>, Integer> b = Maps.newHashMap();
|
||||||
- private final Map<Integer, DataWatcher.Item<?>> c = Maps.newHashMap();
|
private final Entity c;
|
||||||
+ private final Map<Integer, DataWatcher.Item<?>> c = new Int2ObjectOpenHashMap<>(); // Paper
|
- private final Map<Integer, DataWatcher.Item<?>> d = Maps.newHashMap();
|
||||||
private final ReadWriteLock d = new ReentrantReadWriteLock();
|
+ private final Map<Integer, DataWatcher.Item<?>> d = new Int2ObjectOpenHashMap<>(); // Paper
|
||||||
private boolean e = true;
|
private final ReadWriteLock e = new ReentrantReadWriteLock();
|
||||||
private boolean f;
|
private boolean f = true;
|
||||||
|
private boolean g;
|
||||||
--
|
--
|
||||||
Submodule work/BuildData updated: cede5450c9...f37e6395d8
Submodule work/Bukkit updated: da1195392a...c3a46c9b8d
Submodule work/CraftBukkit updated: 1953f52da1...4c1e9342cb
Submodule work/Spigot updated: c3e4052b69...687a0190ef
Reference in New Issue
Block a user