Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 05:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Update CB

Browse Source
This commit is contained in:
Shane Freeder 2017-08-16 16:47:06 +01:00
parent 7a4c06e567
commit 7fc4d26c3f
9 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-API-Patches/Add-MetadataStoreBase.removeAll-Plugin.patch
View File

@ -10,9 +10,10 @@ index 64c0f0a7..6da6abd8 100644
--- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
+++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
@@ -0,0 +0,0 @@ public abstract class MetadataStoreBase<T> {
}
}
/**
+ /**
+ * Removes all metadata in the metadata store that originates from the
+ * given plugin.
+ *
@ -32,8 +33,7 @@ index 64c0f0a7..6da6abd8 100644
+ }
+ }
+
+ /**
/**
* Creates a unique name for the object receiving metadata by combining
* unique data from the subject with a metadataKey.
* <p>
--

6
Spigot-API-Patches/Add-async-chunk-load-API.patch
View File

@ -9,9 +9,10 @@ index 67b0d516..21b2733f 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public Chunk getChunkAt(Block block);
/**
+ /**
+ * Used by {@link World#getChunkAtAsync(Location,ChunkLoadCallback)} methods
+ * to request a {@link Chunk} to be loaded, with this callback receiving
+ * the chunk when it is finished.
@ -83,8 +84,7 @@ index 67b0d516..21b2733f 100644
+ */
+ public void getChunkAtAsync(Block block, ChunkLoadCallback cb);
+
+ /**
/**
* Checks if the specified {@link Chunk} is loaded
*
* @param chunk The chunk to check
--

5
Spigot-API-Patches/Add-source-to-PlayerExpChangeEvent.patch
View File

@ -37,7 +37,7 @@ index f37491d7..30882559 100644
exp = expAmount;
}
/**
+ /**
+ * Get the source that provided the experience.
+ *
+ * @return The source of the experience
@ -48,8 +48,7 @@ index f37491d7..30882559 100644
+ }
+ // Paper end
+
+ /**
/**
* Get the amount of experience the player will receive
*
* @return The amount of experience
--

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

@ -106,9 +106,10 @@ index 31b8f93e..360d2f08 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -0,0 +0,0 @@
</dependency>
</dependencies>
</plugin>
<plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.15</version>
@ -128,10 +129,9 @@ index 31b8f93e..360d2f08 100644
- </signature>
- </configuration>
- </plugin>
- <plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
@@ -0,0 +0,0 @@
</execution>
</executions>

6
Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch
View File

@ -9,9 +9,10 @@ index 360d2f08..c6bdf44e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
</repositories>
<dependencies>
<dependency>
+ <dependency>
+ <groupId>net.sf.trove4j</groupId>
+ <artifactId>trove4j</artifactId>
+ <version>3.0.3</version>
@ -24,8 +25,7 @@ index 360d2f08..c6bdf44e 100644
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
--

6
Spigot-Server-Patches/String-based-Action-Bar-API.patch
View File

@ -66,9 +66,10 @@ index 41330c2a2..f30613672 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper start
@Override
+ @Override
+ public void sendActionBar(String message) {
+ if (getHandle().playerConnection == null || message == null || message.isEmpty()) return;
+ getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO));
@ -80,8 +81,7 @@ index 41330c2a2..f30613672 100644
+ sendActionBar(org.bukkit.ChatColor.translateAlternateColorCodes(alternateChar, message));
+ }
+
+ @Override
@Override
public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
packet.header = header;
--

7
Spigot-Server-Patches/Timings-v2.patch
View File

@ -1399,10 +1399,10 @@ index ec98b3a02..63bbcf0b1 100644
@Override
public YamlConfiguration getConfig()
{
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
return org.spigotmc.SpigotConfig.config;
}
@Override
+ @Override
+ public YamlConfiguration getBukkitConfig()
+ {
+ return configuration;
@ -1420,10 +1420,9 @@ index ec98b3a02..63bbcf0b1 100644
+ return com.destroystokyo.paper.PaperConfig.config;
+ }
+
+ @Override
@Override
public void restart() {
org.spigotmc.RestartCommand.restart();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
deleted file mode 100644
index 311a2c3f6..000000000

6
Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@ -24,18 +24,18 @@ index 7f6f7fe84..d36611644 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
<version>5.0.4</version>
<scope>compile</scope>
</dependency>
<dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>2.12.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.19.3</version>
@@ -0,0 +0,0 @@
<version>3.0.3</version>
<scope>compile</scope>

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 963b19c5995b14f8980a42f13b1bd693a5b411d1
Subproject commit 357b573a19943118a96a8a76142dabd1cb6d9643