mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-07 12:28:13 +02:00
commit
7f38d169dc
@ -1,34 +1,32 @@
|
|||||||
From ed103e824a3c48330567e5b1a0a7bc112e94c4da Mon Sep 17 00:00:00 2001
|
From 4bbb8c7aa24cea492d251eae531d0d88c1565b94 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Tue, 1 Mar 2016 00:16:08 +0100
|
Date: Tue, 1 Mar 2016 00:16:08 +0100
|
||||||
Subject: [PATCH] POM changes
|
Subject: [PATCH] POM changes
|
||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 8c6d1aa1..07143b46 100644
|
index f175b611..2fe7b78e 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -4,44 +4,38 @@
|
@@ -3,39 +3,39 @@
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
|
||||||
- <groupId>org.sonatype.oss</groupId>
|
|
||||||
- <artifactId>oss-parent</artifactId>
|
|
||||||
- <version>9</version>
|
|
||||||
+ <groupId>com.destroystokyo.paper</groupId>
|
|
||||||
+ <artifactId>paper-parent</artifactId>
|
|
||||||
+ <version>dev-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
- <groupId>org.spigotmc</groupId>
|
- <groupId>org.spigotmc</groupId>
|
||||||
- <artifactId>spigot-api</artifactId>
|
- <artifactId>spigot-api</artifactId>
|
||||||
|
+ <parent>
|
||||||
|
+ <groupId>com.destroystokyo.paper</groupId>
|
||||||
|
+ <artifactId>paper-parent</artifactId>
|
||||||
|
+ <version>dev-SNAPSHOT</version>
|
||||||
|
+ </parent>
|
||||||
|
+
|
||||||
+ <groupId>com.destroystokyo.paper</groupId>
|
+ <groupId>com.destroystokyo.paper</groupId>
|
||||||
+ <artifactId>paper-api</artifactId>
|
+ <artifactId>paper-api</artifactId>
|
||||||
<version>1.12.1-R0.1-SNAPSHOT</version>
|
<version>1.12.1-R0.1-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
- <name>Spigot-API</name>
|
- <name>Spigot-API</name>
|
||||||
- <url>http://www.spigotmc.org/</url>
|
- <url>https://www.spigotmc.org/</url>
|
||||||
+ <name>Paper-API</name>
|
+ <name>Paper-API</name>
|
||||||
+ <url>https://github.com/PaperMC/Paper</url>
|
+ <url>https://github.com/PaperMC/Paper</url>
|
||||||
<description>An enhanced plugin API for Minecraft servers.</description>
|
<description>An enhanced plugin API for Minecraft servers.</description>
|
||||||
@ -67,7 +65,7 @@ index 8c6d1aa1..07143b46 100644
|
|||||||
<pluginRepositories>
|
<pluginRepositories>
|
||||||
<pluginRepository>
|
<pluginRepository>
|
||||||
<id>spigotmc-public</id>
|
<id>spigotmc-public</id>
|
||||||
@@ -49,6 +43,17 @@
|
@@ -43,6 +43,17 @@
|
||||||
</pluginRepository>
|
</pluginRepository>
|
||||||
</pluginRepositories>
|
</pluginRepositories>
|
||||||
|
|
||||||
@ -85,7 +83,7 @@ index 8c6d1aa1..07143b46 100644
|
|||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-lang</groupId>
|
<groupId>commons-lang</groupId>
|
||||||
@@ -63,6 +68,13 @@
|
@@ -57,6 +68,13 @@
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -99,7 +97,7 @@ index 8c6d1aa1..07143b46 100644
|
|||||||
<!-- bundled with Minecraft, should be kept in sync -->
|
<!-- bundled with Minecraft, should be kept in sync -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.guava</groupId>
|
<groupId>com.google.guava</groupId>
|
||||||
@@ -107,6 +119,7 @@
|
@@ -101,6 +119,7 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
@ -107,7 +105,7 @@ index 8c6d1aa1..07143b46 100644
|
|||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
@@ -126,26 +139,6 @@
|
@@ -120,26 +139,6 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
@ -134,16 +132,14 @@ index 8c6d1aa1..07143b46 100644
|
|||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
<version>3.0.0</version>
|
<version>3.0.0</version>
|
||||||
@@ -158,8 +151,7 @@
|
@@ -152,6 +151,7 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
<configuration>
|
||||||
- <!-- utterly useless artifact from shade 2.x -->
|
|
||||||
- <createDependencyReducedPom>false</createDependencyReducedPom>
|
|
||||||
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
|
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
|
||||||
<!-- when downloading via Maven we can pull depends individually -->
|
<!-- when downloading via Maven we can pull depends individually -->
|
||||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
<shadedArtifactAttached>true</shadedArtifactAttached>
|
||||||
</configuration>
|
</configuration>
|
||||||
--
|
--
|
||||||
2.13.3.windows.1
|
2.13.4
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From bc7df9c5fea137834099549bf47b227df1813165 Mon Sep 17 00:00:00 2001
|
From 75943d87ca42348d2b2e4bc29498717ec1390150 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 1 May 2016 15:19:49 -0400
|
Date: Sun, 1 May 2016 15:19:49 -0400
|
||||||
Subject: [PATCH] LootTable API
|
Subject: [PATCH] LootTable API
|
||||||
@ -295,83 +295,78 @@ index 00000000..2169493d
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
|
diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
|
||||||
index ade09ddd..368306d0 100644
|
index 97dc7813..a24a4094 100644
|
||||||
--- a/src/main/java/org/bukkit/block/Chest.java
|
--- a/src/main/java/org/bukkit/block/Chest.java
|
||||||
+++ b/src/main/java/org/bukkit/block/Chest.java
|
+++ b/src/main/java/org/bukkit/block/Chest.java
|
||||||
@@ -1,13 +1,14 @@
|
@@ -1,12 +1,13 @@
|
||||||
package org.bukkit.block;
|
package org.bukkit.block;
|
||||||
|
|
||||||
import org.bukkit.Nameable;
|
import org.bukkit.Nameable;
|
||||||
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
|
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a chest.
|
* Represents a captured state of a chest.
|
||||||
*/
|
*/
|
||||||
-public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable {
|
-public interface Chest extends Container, Nameable {
|
||||||
+public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
|
+public interface Chest extends Container, Nameable, LootableInventory { // Paper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the chest's inventory. If this is a double chest, it returns
|
* Gets the inventory of the chest block represented by this block state.
|
||||||
diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
|
diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
|
||||||
index 39ee9b04..236ffa32 100644
|
index 108332df..4430b123 100644
|
||||||
--- a/src/main/java/org/bukkit/block/Dispenser.java
|
--- a/src/main/java/org/bukkit/block/Dispenser.java
|
||||||
+++ b/src/main/java/org/bukkit/block/Dispenser.java
|
+++ b/src/main/java/org/bukkit/block/Dispenser.java
|
||||||
@@ -1,13 +1,14 @@
|
@@ -1,12 +1,13 @@
|
||||||
package org.bukkit.block;
|
package org.bukkit.block;
|
||||||
|
|
||||||
import org.bukkit.Nameable;
|
import org.bukkit.Nameable;
|
||||||
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
|
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
import org.bukkit.projectiles.BlockProjectileSource;
|
import org.bukkit.projectiles.BlockProjectileSource;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a dispenser.
|
* Represents a captured state of a dispenser.
|
||||||
*/
|
*/
|
||||||
-public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable {
|
-public interface Dispenser extends Container, Nameable {
|
||||||
+public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
|
+public interface Dispenser extends Container, Nameable, LootableInventory { // Paper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the BlockProjectileSource object for this dispenser.
|
* Gets the BlockProjectileSource object for the dispenser.
|
||||||
diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
|
diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
|
||||||
index 8e5e3e89..c08a1a50 100644
|
index bc3aeef2..5b698613 100644
|
||||||
--- a/src/main/java/org/bukkit/block/Hopper.java
|
--- a/src/main/java/org/bukkit/block/Hopper.java
|
||||||
+++ b/src/main/java/org/bukkit/block/Hopper.java
|
+++ b/src/main/java/org/bukkit/block/Hopper.java
|
||||||
@@ -1,9 +1,12 @@
|
@@ -1,8 +1,9 @@
|
||||||
package org.bukkit.block;
|
package org.bukkit.block;
|
||||||
|
|
||||||
import org.bukkit.Nameable;
|
import org.bukkit.Nameable;
|
||||||
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
|
+import com.destroystokyo.paper.loottable.LootableInventory; // Paper
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a hopper.
|
* Represents a captured state of a hopper.
|
||||||
*/
|
*/
|
||||||
-public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable { }
|
-public interface Hopper extends Container, Nameable { }
|
||||||
+public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
|
+public interface Hopper extends Container, Nameable, LootableInventory { } // Paper
|
||||||
+
|
\ No newline at end of file
|
||||||
+}
|
|
||||||
diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
|
diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
|
||||||
index 003cfb8a..7b40df14 100644
|
index 4c1740e7..aa1109c4 100644
|
||||||
--- a/src/main/java/org/bukkit/block/ShulkerBox.java
|
--- a/src/main/java/org/bukkit/block/ShulkerBox.java
|
||||||
+++ b/src/main/java/org/bukkit/block/ShulkerBox.java
|
+++ b/src/main/java/org/bukkit/block/ShulkerBox.java
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,12 +1,13 @@
|
||||||
package org.bukkit.block;
|
package org.bukkit.block;
|
||||||
|
|
||||||
+import com.destroystokyo.paper.loottable.LootableInventory;
|
+import com.destroystokyo.paper.loottable.LootableInventory;
|
||||||
import org.bukkit.DyeColor;
|
import org.bukkit.DyeColor;
|
||||||
import org.bukkit.Nameable;
|
import org.bukkit.Nameable;
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
@@ -7,7 +8,7 @@ import org.bukkit.inventory.InventoryHolder;
|
|
||||||
/**
|
/**
|
||||||
* Represents a ShulkerBox.
|
* Represents a captured state of a ShulkerBox.
|
||||||
*/
|
*/
|
||||||
-public interface ShulkerBox extends BlockState, InventoryHolder, Lockable, Nameable {
|
-public interface ShulkerBox extends Container, Nameable {
|
||||||
+public interface ShulkerBox extends BlockState, InventoryHolder, Lockable, Nameable, LootableInventory { // Paper
|
+public interface ShulkerBox extends Container, Nameable, LootableInventory { // Paper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the {@link DyeColor} corresponding to this ShulkerBox
|
* Get the {@link DyeColor} corresponding to this ShulkerBox
|
||||||
--
|
--
|
||||||
2.12.2
|
2.13.4
|
||||||
|
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
From 44f2671b31ac71bd6408dcc230cafa239470f434 Mon Sep 17 00:00:00 2001
|
From b9de0f8861bf3e9f78624a40dd7855b376707eb5 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Mon, 29 Feb 2016 20:40:33 -0600
|
Date: Mon, 29 Feb 2016 20:40:33 -0600
|
||||||
Subject: [PATCH] POM Changes
|
Subject: [PATCH] POM Changes
|
||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 9072ab9f4..bb305c7c2 100644
|
index cbd561aed..7f6f7fe84 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -1,12 +1,12 @@
|
@@ -1,12 +1,12 @@
|
||||||
@ -141,7 +141,7 @@ index 9072ab9f4..bb305c7c2 100644
|
|||||||
@@ -247,18 +239,6 @@
|
@@ -247,18 +239,6 @@
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.6.1</version>
|
<version>3.6.2</version>
|
||||||
- <configuration>
|
- <configuration>
|
||||||
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
|
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
|
||||||
- <compilerId>eclipse</compilerId>
|
- <compilerId>eclipse</compilerId>
|
||||||
@ -171,5 +171,5 @@ index 93046379d..674096cab 100644
|
|||||||
|
|
||||||
if (stream != null) {
|
if (stream != null) {
|
||||||
--
|
--
|
||||||
2.13.3.windows.1
|
2.13.4
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 7a0cb308aec1ec2f127ee1de2cfadca2f3360460 Mon Sep 17 00:00:00 2001
|
From 21e11d3533310ed87cce7b06c7cfa73e8dbedd78 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 1 May 2016 21:19:14 -0400
|
Date: Sun, 1 May 2016 21:19:14 -0400
|
||||||
Subject: [PATCH] LootTable API & Replenishable Lootables Feature
|
Subject: [PATCH] LootTable API & Replenishable Lootables Feature
|
||||||
@ -657,8 +657,21 @@ index a97ad2037..618521304 100644
|
|||||||
+ // Paper end
|
+ // Paper end
|
||||||
+
|
+
|
||||||
}
|
}
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
||||||
|
index cf94c0626..52c982893 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
||||||
|
@@ -60,7 +60,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
|
||||||
|
}
|
||||||
|
|
||||||
|
// gets the wrapped TileEntity
|
||||||
|
- protected T getTileEntity() {
|
||||||
|
+ public T getTileEntity() { // Paper - protected -> public
|
||||||
|
return tileEntity;
|
||||||
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
|
||||||
index 3de7e14d8..6cab545e5 100644
|
index 85f3bb272..733c04ef7 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,5 +1,6 @@
|
||||||
@ -672,13 +685,13 @@ index 3de7e14d8..6cab545e5 100644
|
|||||||
import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest;
|
import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
|
|
||||||
-public class CraftChest extends CraftLootable implements Chest {
|
-public class CraftChest extends CraftLootable<TileEntityChest> implements Chest {
|
||||||
+public class CraftChest extends CraftLootable implements Chest, CraftLootableBlockInventory { // Paper
|
+public class CraftChest extends CraftLootable<TileEntityChest> implements Chest, CraftLootableBlockInventory { // Paper
|
||||||
private final CraftWorld world;
|
|
||||||
private final TileEntityChest chest;
|
|
||||||
|
|
||||||
|
public CraftChest(final Block block) {
|
||||||
|
super(block, TileEntityChest.class);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
|
||||||
index cc0d28f21..1b28e8ba2 100644
|
index 1dc8bfecd..bfcf9b6c4 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,5 +1,6 @@
|
||||||
@ -692,13 +705,13 @@ index cc0d28f21..1b28e8ba2 100644
|
|||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
import org.bukkit.projectiles.BlockProjectileSource;
|
import org.bukkit.projectiles.BlockProjectileSource;
|
||||||
|
|
||||||
-public class CraftDispenser extends CraftLootable implements Dispenser {
|
-public class CraftDispenser extends CraftLootable<TileEntityDispenser> implements Dispenser {
|
||||||
+public class CraftDispenser extends CraftLootable implements Dispenser, CraftLootableBlockInventory { // Paper
|
+public class CraftDispenser extends CraftLootable<TileEntityDispenser> implements Dispenser, CraftLootableBlockInventory {
|
||||||
private final CraftWorld world;
|
|
||||||
private final TileEntityDispenser dispenser;
|
|
||||||
|
|
||||||
|
public CraftDispenser(final Block block) {
|
||||||
|
super(block, TileEntityDispenser.class);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
|
||||||
index b7a04bd84..5d4a5519d 100644
|
index 6566554ab..df156d0d9 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,5 +1,6 @@
|
||||||
@ -708,17 +721,17 @@ index b7a04bd84..5d4a5519d 100644
|
|||||||
import net.minecraft.server.TileEntityHopper;
|
import net.minecraft.server.TileEntityHopper;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
@@ -8,7 +9,7 @@ import org.bukkit.craftbukkit.CraftWorld;
|
@@ -7,7 +8,7 @@ import org.bukkit.block.Hopper;
|
||||||
import org.bukkit.craftbukkit.inventory.CraftInventory;
|
import org.bukkit.craftbukkit.inventory.CraftInventory;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
|
|
||||||
-public class CraftHopper extends CraftLootable implements Hopper {
|
-public class CraftHopper extends CraftLootable<TileEntityHopper> implements Hopper {
|
||||||
+public class CraftHopper extends CraftLootable implements Hopper, CraftLootableBlockInventory { // Paper
|
+public class CraftHopper extends CraftLootable<TileEntityHopper> implements Hopper, CraftLootableBlockInventory {
|
||||||
private final TileEntityHopper hopper;
|
|
||||||
|
|
||||||
public CraftHopper(final Block block) {
|
public CraftHopper(final Block block) {
|
||||||
|
super(block, TileEntityHopper.class);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
|
||||||
index 788c60263..dc2648094 100644
|
index c029a1244..c26f0b5af 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,5 +1,6 @@
|
||||||
@ -726,26 +739,17 @@ index 788c60263..dc2648094 100644
|
|||||||
|
|
||||||
+import com.destroystokyo.paper.loottable.CraftLootableBlockInventory;
|
+import com.destroystokyo.paper.loottable.CraftLootableBlockInventory;
|
||||||
import net.minecraft.server.BlockShulkerBox;
|
import net.minecraft.server.BlockShulkerBox;
|
||||||
import net.minecraft.server.TileEntity;
|
|
||||||
import net.minecraft.server.TileEntityShulkerBox;
|
import net.minecraft.server.TileEntityShulkerBox;
|
||||||
@@ -11,7 +12,7 @@ import org.bukkit.craftbukkit.CraftWorld;
|
import org.bukkit.DyeColor;
|
||||||
import org.bukkit.craftbukkit.inventory.CraftInventory;
|
@@ -10,7 +11,7 @@ import org.bukkit.craftbukkit.inventory.CraftInventory;
|
||||||
|
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
|
|
||||||
-public class CraftShulkerBox extends CraftLootable implements ShulkerBox {
|
-public class CraftShulkerBox extends CraftLootable<TileEntityShulkerBox> implements ShulkerBox {
|
||||||
+public class CraftShulkerBox extends CraftLootable implements ShulkerBox, CraftLootableBlockInventory { // Paper
|
+public class CraftShulkerBox extends CraftLootable<TileEntityShulkerBox> implements ShulkerBox, CraftLootableBlockInventory {
|
||||||
|
|
||||||
private final CraftWorld world;
|
|
||||||
private final TileEntityShulkerBox box;
|
|
||||||
@@ -31,7 +32,7 @@ public class CraftShulkerBox extends CraftLootable implements ShulkerBox {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
- public TileEntity getTileEntity() {
|
|
||||||
+ public TileEntityShulkerBox getTileEntity() { // Paper
|
|
||||||
return box;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
public CraftShulkerBox(final Block block) {
|
||||||
|
super(block, TileEntityShulkerBox.class);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
|
||||||
index 69435c457..4291edf25 100644
|
index 69435c457..4291edf25 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
|
||||||
@ -787,5 +791,5 @@ index e9963e21c..acb4dee04 100644
|
|||||||
|
|
||||||
CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
|
CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
|
||||||
--
|
--
|
||||||
2.13.0
|
2.13.4
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 44f44320429cbaf170a76e6e04f7d4deb562d5c0 Mon Sep 17 00:00:00 2001
|
From 65ebb33b40bb557b9e20f19e92cd6f61f5b40e9c Mon Sep 17 00:00:00 2001
|
||||||
From: Minecrell <dev@minecrell.net>
|
From: Minecrell <dev@minecrell.net>
|
||||||
Date: Fri, 9 Jun 2017 19:03:43 +0200
|
Date: Fri, 9 Jun 2017 19:03:43 +0200
|
||||||
Subject: [PATCH] Use TerminalConsoleAppender for console improvements
|
Subject: [PATCH] Use TerminalConsoleAppender for console improvements
|
||||||
@ -20,7 +20,7 @@ Other changes:
|
|||||||
configuration
|
configuration
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index bb305c7c2..793d2724c 100644
|
index 7f6f7fe84..d36611644 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -54,12 +54,6 @@
|
@@ -54,12 +54,6 @@
|
||||||
@ -35,7 +35,7 @@ index bb305c7c2..793d2724c 100644
|
|||||||
- <dependency>
|
- <dependency>
|
||||||
<groupId>org.xerial</groupId>
|
<groupId>org.xerial</groupId>
|
||||||
<artifactId>sqlite-jdbc</artifactId>
|
<artifactId>sqlite-jdbc</artifactId>
|
||||||
<version>3.18.0</version>
|
<version>3.19.3</version>
|
||||||
@@ -77,6 +71,38 @@
|
@@ -77,6 +71,38 @@
|
||||||
<version>3.0.3</version>
|
<version>3.0.3</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
@ -639,5 +639,5 @@ index 5cee8f00e..08b6bb7f9 100644
|
|||||||
<AppenderRef ref="TerminalConsole" level="info"/>
|
<AppenderRef ref="TerminalConsole" level="info"/>
|
||||||
</Root>
|
</Root>
|
||||||
--
|
--
|
||||||
2.13.3.windows.1
|
2.13.4
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 0aeac440c05a3ae3b69095e109372b7400f0feae
|
Subproject commit 079e67c2b0a68e8ab64bc292681161031e4211fa
|
@ -1 +1 @@
|
|||||||
Subproject commit 63029f4ff3745380bedc1d6557b81c1a183d45ec
|
Subproject commit 571760182fb8c5326de812259ddef80564953a1d
|
@ -1 +1 @@
|
|||||||
Subproject commit edd03964c6c1d7fb9617ac3f7183357dcbbc28fe
|
Subproject commit 0d820fa70fa4ca6bdfc6cd3c8a13377a60424774
|
Loading…
Reference in New Issue
Block a user