Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 02:55:47 +01:00
Code Issues Projects Releases Wiki Activity

Update to Minecraft 1.11.2

Browse Source
This commit is contained in:
md_5 2016-12-21 22:00:00 +11:00
parent fb50a80d0f
commit a86731306b
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nms-patches/DedicatedServer.patch
View File

@ -98,7 +98,7 @@
+
thread.setDaemon(true);
thread.start();
DedicatedServer.LOGGER.info("Starting minecraft server version 1.11.1");
DedicatedServer.LOGGER.info("Starting minecraft server version 1.11.2");
@@ -78,7 +125,7 @@
}

42
nms-patches/Entity.patch
View File

@ -200,7 +200,7 @@
if (this.playStepSound() && (!this.onGround || !this.isSneaking() || !(this instanceof EntityHuman)) && !this.isPassenger()) {
double d22 = this.locX - d4;
double d23 = this.locY - d5;
@@ -683,6 +812,8 @@
@@ -681,6 +810,8 @@
}
}
@ -209,7 +209,7 @@
try {
this.checkBlockCollisions();
} catch (Throwable throwable) {
@@ -692,6 +823,8 @@
@@ -690,6 +821,8 @@
this.appendEntityCrashDetails(crashreportsystemdetails);
throw new ReportedException(crashreport);
}
@ -218,7 +218,7 @@
boolean flag1 = this.ai();
@@ -700,7 +833,14 @@
@@ -698,7 +831,14 @@
if (!flag1) {
++this.fireTicks;
if (this.fireTicks == 0) {
@ -234,7 +234,7 @@
}
}
} else if (this.fireTicks <= 0) {
@@ -821,7 +961,7 @@
@@ -819,7 +959,7 @@
return null;
}
@ -243,7 +243,7 @@
if (!this.fireProof) {
this.damageEntity(DamageSource.FIRE, (float) i);
}
@@ -991,6 +1131,13 @@
@@ -987,6 +1127,13 @@
}
public void spawnIn(World world) {
@ -257,7 +257,7 @@
this.world = world;
}
@@ -1223,6 +1370,18 @@
@@ -1219,6 +1366,18 @@
try {
nbttagcompound.set("Pos", this.a(new double[] { this.locX, this.locY, this.locZ}));
nbttagcompound.set("Motion", this.a(new double[] { this.motX, this.motY, this.motZ}));
@ -276,7 +276,7 @@
nbttagcompound.set("Rotation", this.a(new float[] { this.yaw, this.pitch}));
nbttagcompound.setFloat("FallDistance", this.fallDistance);
nbttagcompound.setShort("Fire", (short) this.fireTicks);
@@ -1232,6 +1391,12 @@
@@ -1228,6 +1387,12 @@
nbttagcompound.setBoolean("Invulnerable", this.invulnerable);
nbttagcompound.setInt("PortalCooldown", this.portalCooldown);
nbttagcompound.a("UUID", this.getUniqueID());
@ -289,7 +289,7 @@
if (this.hasCustomName()) {
nbttagcompound.setString("CustomName", this.getCustomName());
}
@@ -1307,6 +1472,8 @@
@@ -1303,6 +1468,8 @@
this.motX = nbttaglist1.e(0);
this.motY = nbttaglist1.e(1);
this.motZ = nbttaglist1.e(2);
@ -298,7 +298,7 @@
if (Math.abs(this.motX) > 10.0D) {
this.motX = 0.0D;
}
@@ -1318,6 +1485,7 @@
@@ -1314,6 +1481,7 @@
if (Math.abs(this.motZ) > 10.0D) {
this.motZ = 0.0D;
}
@ -306,7 +306,7 @@
this.locX = nbttaglist.e(0);
this.locY = nbttaglist.e(1);
@@ -1375,6 +1543,58 @@
@@ -1371,6 +1539,58 @@
this.setPosition(this.locX, this.locY, this.locZ);
}
@ -365,7 +365,7 @@
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
@@ -1442,6 +1662,12 @@
@@ -1438,6 +1658,12 @@
if (itemstack.isEmpty()) {
return null;
} else {
@ -378,7 +378,7 @@
EntityItem entityitem = new EntityItem(this.world, this.locX, this.locY + (double) f, this.locZ, itemstack);
entityitem.q();
@@ -1567,6 +1793,24 @@
@@ -1563,6 +1789,24 @@
if (entity.bB() != this) {
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
} else {
@ -403,7 +403,7 @@
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bw() instanceof EntityHuman)) {
this.passengers.add(0, entity);
} else {
@@ -1580,6 +1824,22 @@
@@ -1576,6 +1820,22 @@
if (entity.bB() == this) {
throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
} else {
@ -426,7 +426,7 @@
this.passengers.remove(entity);
entity.j = 60;
}
@@ -1719,14 +1979,48 @@
@@ -1715,14 +1975,48 @@
}
public void setAirTicks(int i) {
@ -478,7 +478,7 @@
}
}
@@ -1871,19 +2165,67 @@
@@ -1867,19 +2161,67 @@
if (!this.world.isClientSide && !this.dead) {
this.world.methodProfiler.a("changeDimension");
MinecraftServer minecraftserver = this.B_();
@ -549,7 +549,7 @@
BlockPosition blockposition;
if (i == 1) {
@@ -1912,12 +2254,18 @@
@@ -1908,12 +2250,18 @@
blockposition = new BlockPosition(this);
}
@ -569,7 +569,7 @@
if (j == 1 && i == 1) {
BlockPosition blockposition1 = worldserver1.q(worldserver1.getSpawn());
@@ -1925,6 +2273,7 @@
@@ -1921,6 +2269,7 @@
} else {
entity.setPositionRotation(blockposition, entity.yaw, entity.pitch);
}
@ -577,7 +577,7 @@
boolean flag = entity.attachedToPlayer;
@@ -1932,6 +2281,14 @@
@@ -1928,6 +2277,14 @@
worldserver1.addEntity(entity);
entity.attachedToPlayer = flag;
worldserver1.entityJoinedWorld(entity, false);
@ -592,7 +592,7 @@
}
this.dead = true;
@@ -2042,6 +2399,11 @@
@@ -2038,6 +2395,11 @@
}
public void setCustomName(String s) {
@ -604,7 +604,7 @@
this.datawatcher.set(Entity.aA, s);
}
@@ -2099,7 +2461,26 @@
@@ -2095,7 +2457,26 @@
}
public void a(AxisAlignedBB axisalignedbb) {
@ -632,7 +632,7 @@
}
public float getHeadHeight() {
@@ -2273,7 +2654,7 @@
@@ -2269,7 +2650,7 @@
for (Iterator iterator = this.bx().iterator(); iterator.hasNext(); entity.a(oclass, set)) {
entity = (Entity) iterator.next();
if (oclass.isAssignableFrom(entity.getClass())) {

2
nms-patches/HandshakeListener.patch
View File

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

4
pom.xml
View File

@ -4,14 +4,14 @@
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<packaging>jar</packaging>
<version>1.11.1-R0.1-SNAPSHOT</version>
<version>1.11.2-R0.1-SNAPSHOT</version>
<name>CraftBukkit</name>
<url>http://www.bukkit.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<api.version>unknown</api.version>
<minecraft.version>1.11.1</minecraft.version>
<minecraft.version>1.11.2</minecraft.version>
<minecraft_version>1_11_R1</minecraft_version>
<buildtag.prefix>git-Bukkit-</buildtag.prefix>
<buildtag.suffix></buildtag.suffix>