Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-08-22 20:33:30 +02:00
Code Issues Projects Releases Wiki Activity

Update to Minecraft 1.10.2

Browse Source
This commit is contained in:
md_5 2016-06-25 11:54:17 +10:00
parent 1953f52da1
commit 75f99ec7c5
8 changed files with 23 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nms-patches/BlockSoil.patch
View File

@ -12,7 +12,7 @@
public class BlockSoil extends Block {
public static final BlockStateInteger MOISTURE = BlockStateInteger.of("moisture", 0, 7);
@@ -40,6 +45,12 @@
@@ -35,6 +40,12 @@
if (i > 0) {
world.setTypeAndData(blockposition, iblockdata.set(BlockSoil.MOISTURE, Integer.valueOf(i - 1)), 2);
} else if (!this.b(world, blockposition)) {
@ -25,7 +25,7 @@
world.setTypeUpdate(blockposition, Blocks.DIRT.getBlockData());
}
} else if (i < 7) {
@@ -49,11 +60,31 @@
@@ -44,11 +55,31 @@
}
public void fallOn(World world, BlockPosition blockposition, Entity entity, float f) {

6
nms-patches/DataWatcher.patch
View File

@ -1,6 +1,6 @@
--- a/net/minecraft/server/DataWatcher.java
+++ b/net/minecraft/server/DataWatcher.java
@@ -55,7 +55,7 @@
@@ -70,7 +70,7 @@
}
}
@ -9,7 +9,7 @@
int i = datawatcherobject.a();
if (i > 254) {
@@ -69,7 +69,7 @@
@@ -84,7 +84,7 @@
}
}
@ -17,4 +17,4 @@
+ private <T> void registerObject(DataWatcherObject<T> datawatcherobject, Object t0) { // CraftBukkit Object
DataWatcher.Item datawatcher_item = new DataWatcher.Item(datawatcherobject, t0);
this.d.writeLock().lock();
this.e.writeLock().lock();

2
nms-patches/DedicatedServer.patch
View File

@ -110,7 +110,7 @@
+
thread.setDaemon(true);
thread.start();
DedicatedServer.LOGGER.info("Starting minecraft server version 1.10");
DedicatedServer.LOGGER.info("Starting minecraft server version 1.10.2");
@@ -78,7 +124,7 @@
}

20
nms-patches/EnderDragonBattle.patch
View File

@ -1,20 +0,0 @@
--- a/net/minecraft/server/EnderDragonBattle.java
+++ b/net/minecraft/server/EnderDragonBattle.java
@@ -246,7 +246,7 @@
ShapeDetector.ShapeDetectorCollection shapedetector_shapedetectorcollection = this.f.a(this.d, tileentity.getPosition());
if (shapedetector_shapedetectorcollection != null) {
- BlockPosition blockposition = shapedetector_shapedetectorcollection.a(3, 3, 4).getPosition();
+ BlockPosition blockposition = shapedetector_shapedetectorcollection.a(3, 3, 3).getPosition(); // CraftBukkit - 4 -> 3
if (this.o == null && blockposition.getX() == 0 && blockposition.getZ() == 0) {
this.o = blockposition;
@@ -266,7 +266,7 @@
if (shapedetector_shapedetectorcollection1 != null) {
if (this.o == null) {
- this.o = shapedetector_shapedetectorcollection1.a(3, 3, 4).getPosition();
+ this.o = shapedetector_shapedetectorcollection1.a(3, 3, 3).getPosition(); // CraftBukkit - 4 -> 3
}
return shapedetector_shapedetectorcollection1;

2
nms-patches/EntityPotion.patch
View File

@ -13,7 +13,7 @@
+
public class EntityPotion extends EntityProjectile {
private static final DataWatcherObject<Optional<ItemStack>> d = DataWatcher.a(EntityItem.class, DataWatcherRegistry.f);
private static final DataWatcherObject<Optional<ItemStack>> d = DataWatcher.a(EntityPotion.class, DataWatcherRegistry.f);
@@ -78,10 +85,11 @@
this.world.triggerEffect(2002, new BlockPosition(this), PotionRegistry.a(potionregistry));
this.die();

2
nms-patches/HandshakeListener.patch
View File

@ -58,7 +58,7 @@
+ // CraftBukkit end
+
if (packethandshakinginsetprotocol.b() > 210) {
chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.10");
chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.10.2");
this.b.sendPacket(new PacketLoginOutDisconnect(chatcomponenttext));
@@ -26,6 +71,7 @@
this.b.close(chatcomponenttext);

28
nms-patches/World.patch
View File

@ -434,7 +434,7 @@
}
}
}
@@ -1240,7 +1484,10 @@
@@ -1247,7 +1491,10 @@
int j = MathHelper.floor(entity.locZ);
boolean flag1 = true;
@ -446,7 +446,7 @@
entity.M = entity.locX;
entity.N = entity.locY;
entity.O = entity.locZ;
@@ -1579,11 +1826,18 @@
@@ -1586,11 +1833,18 @@
}
}
@ -465,7 +465,7 @@
TileEntity tileentity = null;
if (this.M) {
@@ -1618,6 +1872,14 @@
@@ -1625,6 +1879,14 @@
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
if (!this.E(blockposition)) {
if (tileentity != null && !tileentity.x()) {
@ -480,7 +480,7 @@
if (this.M) {
tileentity.setPosition(blockposition);
Iterator iterator = this.b.iterator();
@@ -1773,6 +2035,14 @@
@@ -1780,6 +2042,14 @@
}
this.o = MathHelper.a(this.o, 0.0F, 1.0F);
@ -495,7 +495,7 @@
}
}
}
@@ -1904,7 +2174,10 @@
@@ -1911,7 +2181,10 @@
}
public boolean c(EnumSkyBlock enumskyblock, BlockPosition blockposition) {
@ -507,7 +507,7 @@
return false;
} else {
int i = 0;
@@ -2071,7 +2344,7 @@
@@ -2078,7 +2351,7 @@
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
@ -516,7 +516,7 @@
arraylist.add(entity);
}
}
@@ -2086,7 +2359,7 @@
@@ -2093,7 +2366,7 @@
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
@ -525,7 +525,7 @@
arraylist.add(entity);
}
}
@@ -2135,7 +2408,7 @@
@@ -2142,7 +2415,7 @@
}
}
@ -534,7 +534,7 @@
}
@Nullable
@@ -2156,8 +2429,17 @@
@@ -2163,8 +2436,17 @@
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
@ -554,7 +554,7 @@
++i;
}
}
@@ -2166,12 +2448,18 @@
@@ -2173,12 +2455,18 @@
}
public void a(Collection<Entity> collection) {
@ -574,7 +574,7 @@
this.b(entity);
}
@@ -2185,7 +2473,13 @@
@@ -2192,7 +2480,13 @@
IBlockData iblockdata = this.getType(blockposition);
AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().d(this, blockposition);
@ -589,7 +589,7 @@
}
public int K() {
@@ -2288,6 +2582,11 @@
@@ -2295,6 +2589,11 @@
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman1 = (EntityHuman) this.players.get(i);
@ -601,7 +601,7 @@
if ((IEntitySelector.d.apply(entityhuman1) || !flag) && (IEntitySelector.e.apply(entityhuman1) || flag)) {
double d5 = entityhuman1.e(d0, d1, d2);
@@ -2456,6 +2755,16 @@
@@ -2463,6 +2762,16 @@
public void everyoneSleeping() {}
@ -618,7 +618,7 @@
public float h(float f) {
return (this.p + (this.q - this.p) * f) * this.j(f);
}
@@ -2673,7 +2982,7 @@
@@ -2680,7 +2989,7 @@
int l = j * 16 + 8 - blockposition.getZ();
boolean flag = true;

2
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<packaging>jar</packaging>
<version>1.10-R0.1-SNAPSHOT</version>
<version>1.10.2-R0.1-SNAPSHOT</version>
<name>CraftBukkit</name>
<url>http://www.bukkit.org</url>