Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-17 13:51:23 +01:00
Code Issues Projects Releases Wiki Activity

Update to 1.8.6

Browse Source
This commit is contained in:
Zach Brown 2015-05-25 15:59:30 -05:00
parent f4b537ae66
commit e6727223f8
3 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-API-Patches/POM-changes.patch
View File

@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <artifactId>spigot-api</artifactId> - <artifactId>spigot-api</artifactId>
+ <groupId>org.github.paperspigot</groupId> + <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot-api</artifactId> + <artifactId>paperspigot-api</artifactId>
<version>1.8.5-R0.1-SNAPSHOT</version> <version>1.8.6-R0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>Spigot-API</name> - <name>Spigot-API</name>

2
Spigot-Server-Patches/POM-Changes.patch
View File

@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ <groupId>org.github.paperspigot</groupId> + <groupId>org.github.paperspigot</groupId>
+ <artifactId>paperspigot</artifactId> + <artifactId>paperspigot</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.8.5-R0.1-SNAPSHOT</version> <version>1.8.6-R0.1-SNAPSHOT</version>
- <name>Spigot</name> - <name>Spigot</name>
- <url>http://www.spigotmc.org</url> - <url>http://www.spigotmc.org</url>
+ <name>PaperSpigot</name> + <name>PaperSpigot</name>

25
Spigot-Server-Patches/mc-dev-imports.patch
View File

@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com> From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 23 May 2015 13:00:52 -0500 Date: Mon, 25 May 2015 15:37:00 -0500
Subject: [PATCH] mc-dev imports Subject: [PATCH] mc-dev imports
@ -728,7 +728,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if (world.setTypeAndData(blockposition, iblockdata1, 3)) { + if (world.setTypeAndData(blockposition, iblockdata1, 3)) {
+ iblockdata1 = world.getType(blockposition); + iblockdata1 = world.getType(blockposition);
+ if (iblockdata1.getBlock() == this.a) { + if (iblockdata1.getBlock() == this.a) {
+ a(world, blockposition, itemstack); + a(world, entityhuman, blockposition, itemstack);
+ this.a.postPlace(world, blockposition, iblockdata1, entityhuman, itemstack); + this.a.postPlace(world, blockposition, iblockdata1, entityhuman, itemstack);
+ } + }
+ +
@ -742,11 +742,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ } + }
+ +
+ public static boolean a(World world, BlockPosition blockposition, ItemStack itemstack) { + public static boolean a(World world, EntityHuman entityhuman, BlockPosition blockposition, ItemStack itemstack) {
+ MinecraftServer minecraftserver = MinecraftServer.getServer();
+
+ if (minecraftserver == null) {
+ return false;
+ } else {
+ if (itemstack.hasTag() && itemstack.getTag().hasKeyOfType("BlockEntityTag", 10)) { + if (itemstack.hasTag() && itemstack.getTag().hasKeyOfType("BlockEntityTag", 10)) {
+ TileEntity tileentity = world.getTileEntity(blockposition); + TileEntity tileentity = world.getTileEntity(blockposition);
+ +
+ if (tileentity != null) { + if (tileentity != null) {
+ if (!world.isClientSide && tileentity.F() && !minecraftserver.getPlayerList().isOp(entityhuman.getProfile())) {
+ return false;
+ }
+
+ NBTTagCompound nbttagcompound = new NBTTagCompound(); + NBTTagCompound nbttagcompound = new NBTTagCompound();
+ NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttagcompound.clone(); + NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttagcompound.clone();
+ +
@ -767,8 +776,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ return false; + return false;
+ } + }
+ }
+ +
+ public String f_(ItemStack itemstack) { + public String e_(ItemStack itemstack) {
+ return this.a.a(); + return this.a.a();
+ } + }
+ +
@ -780,13 +790,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return this.a; + return this.a;
+ } + }
+ +
+ public static void d_(ItemStack itemstack) {
+ if (itemstack.hasTag() && itemstack.getTag().hasKeyOfType("BlockEntityTag", 10)) {
+ itemstack.getTag().remove("BlockEntityTag");
+ }
+
+ }
+
+ public Item c(String s) { + public Item c(String s) {
+ return this.b(s); + return this.b(s);
+ } + }