mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upstream merge: conflict resolution and version bump

Browse source
This commit is contained in:
md_5 2014-05-15 17:05:45 +10:00
parent 65b083577b
commit e052eada8c
12 changed files with 64 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit 24883a61704f78a952e948c429f63c4a2ab39912
Subproject commit 91410848816e1c9824207d0f9a93e379bb9f02e4

27
Bukkit-Patches/0001-POM-Changes.patch
View file

@ -1,29 +1,21 @@
From 168645b6eec4fbdde9ca863f240fecdf9f63ca4c Mon Sep 17 00:00:00 2001
From 08a077bcb805a326ab9197a5814d2a9a54762c90 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index feac8db..aa8a63d 100644
index 23b7cc3..b394a33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,43 +1,23 @@
@@ -1,42 +1,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
- <groupId>org.bukkit</groupId>
- <artifactId>bukkit</artifactId>
+
+ <parent>
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-parent</artifactId>
+ <version>dev-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.7.9-R0.1-SNAPSHOT</version>
<version>1.7.9-R0.2-SNAPSHOT</version>
- <name>Bukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot-API</name>
@ -60,10 +52,15 @@ index feac8db..aa8a63d 100644
- <url>http://repo.bukkit.org/content/repositories/snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-
+ <parent>
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-parent</artifactId>
+ <version>dev-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<build>
<plugins>
<plugin>
--
1.8.5.2.msysgit.0
1.9.1

10
Bukkit-Patches/0011-Update-Depends.patch
View file

@ -1,4 +1,4 @@
From e8da0323d4163ef96b9be72eabe3d5b730834efd Mon Sep 17 00:00:00 2001
From b1dcd5bfb51249023019a871be0586f76faf18ba Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 4 Jul 2013 20:05:19 +1000
Subject: [PATCH] Update Depends
@ -6,10 +6,10 @@ Subject: [PATCH] Update Depends
- All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
diff --git a/pom.xml b/pom.xml
index fb303e2..5187a99 100644
index b394a33..4252e34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,21 +77,21 @@
@@ -76,21 +76,21 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
@ -34,7 +34,7 @@ index fb303e2..5187a99 100644
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -105,7 +105,7 @@
@@ -104,7 +104,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@ -44,5 +44,5 @@ index fb303e2..5187a99 100644
<!-- testing -->
--
1.8.3.2
1.9.1

2
CraftBukkit

@ -1 +1 @@
Subproject commit e1cec477acaa2c6e140a5d3d37c1797f55569e23
Subproject commit 578627622c3c374d6e123f7aa8acc6df9fbd23c9

35
CraftBukkit-Patches/0001-POM-Changes.patch
View file

@ -1,31 +1,23 @@
From 0583597f21e65ab38ab36899f99299a6463a1735 Mon Sep 17 00:00:00 2001
From a7344d5de1c9952cf0e2c9e27a3a5f3283289a53 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 84a00a3..607be4e 100644
index b4b7ae0..006d26b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,20 @@
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
- <groupId>org.bukkit</groupId>
- <artifactId>craftbukkit</artifactId>
+
+ <parent>
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-parent</artifactId>
+ <version>dev-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.7.9-R0.1-SNAPSHOT</version>
<version>1.7.9-R0.2-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>
@ -33,7 +25,7 @@ index 84a00a3..607be4e 100644
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -18,25 +26,6 @@
@@ -18,24 +18,12 @@
<buildtag.suffix></buildtag.suffix>
</properties>
@ -55,11 +47,16 @@ index 84a00a3..607be4e 100644
- <url>http://repo.bukkit.org/content/repositories/snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-
+ <parent>
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-parent</artifactId>
+ <version>dev-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<repositories>
<repository>
<id>repobo-snap</id>
@@ -53,8 +42,8 @@
@@ -53,8 +41,8 @@
<dependencies>
<dependency>
@ -70,7 +67,7 @@ index 84a00a3..607be4e 100644
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -107,33 +96,6 @@
@@ -107,33 +95,6 @@
<artifactId>gson</artifactId>
<version>2.1</version>
</dependency>
@ -104,7 +101,7 @@ index 84a00a3..607be4e 100644
<!-- testing -->
<dependency>
<groupId>junit</groupId>
@@ -147,19 +109,24 @@
@@ -147,19 +108,24 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
@ -132,7 +129,7 @@ index 84a00a3..607be4e 100644
</configuration>
<executions>
<execution>
@@ -212,7 +179,7 @@
@@ -212,7 +178,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>

9
CraftBukkit-Patches/0014-Improved-Timings-System.patch
View file

@ -1,4 +1,4 @@
From 151ed358c7071fc7ff19e3a0c0e54f294d10889d Mon Sep 17 00:00:00 2001
From 1a8db6be08fe4fb0d33d2f448b4ad333324ba75b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System
@ -139,7 +139,7 @@ index 17b15f6..21cf068 100644
public boolean getAllowNether() {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 75a5cbe..5cde08f 100644
index 89ef6fa..253a448 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -940,6 +940,7 @@ public class PlayerConnection implements PacketPlayInListener {
@ -148,9 +148,9 @@ index 75a5cbe..5cde08f 100644
private void handleCommand(String s) {
+ org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
// CraftBukkit start - whole method
CraftPlayer player = this.getPlayer();
this.c.info(this.player.getName() + " issued server command: " + s);
@@ -947,19 +948,23 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -949,18 +950,22 @@ public class PlayerConnection implements PacketPlayInListener {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@ -159,7 +159,6 @@ index 75a5cbe..5cde08f 100644
}
try {
this.c.info(event.getPlayer().getName() + " issued server command: " + event.getMessage());
if (this.server.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) {
+ org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
return;

25
CraftBukkit-Patches/0033-Allow-Disabling-of-Command-Logging.patch
View file

@ -1,27 +1,22 @@
From 43b719a4545c2790eae1ac8b636f1d1042445fcc Mon Sep 17 00:00:00 2001
From 8123ddb10e530f8f513253a31a957a0c0cc2b545 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5cde08f..4d7f5ad 100644
index 253a448..c581334 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -953,7 +953,12 @@ public class PlayerConnection implements PacketPlayInListener {
}
@@ -942,7 +942,7 @@ public class PlayerConnection implements PacketPlayInListener {
private void handleCommand(String s) {
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
// CraftBukkit start - whole method
- this.c.info(this.player.getName() + " issued server command: " + s);
+ if ( org.spigotmc.SpigotConfig.logCommands ) this.c.info(this.player.getName() + " issued server command: " + s); // Spigot
CraftPlayer player = this.getPlayer();
try {
- this.c.info(event.getPlayer().getName() + " issued server command: " + event.getMessage());
+ // Spigot Start
+ if ( org.spigotmc.SpigotConfig.logCommands )
+ {
+ this.c.info(event.getPlayer().getName() + " issued server command: " + event.getMessage());
+ }
+ // Spigot end
if (this.server.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) {
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
return;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 98fcb47..afd6b56 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java

6
CraftBukkit-Patches/0038-Disallow-Interaction-With-Self.patch
View file

@ -1,14 +1,14 @@
From 2897b0b82547e474f84cd331f3485ee9c509881f Mon Sep 17 00:00:00 2001
From d4363413bc30737605f456aedc7a6f1b85e6de7b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4d7f5ad..07658df 100644
index c581334..662eb5a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1060,6 +1060,13 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1056,6 +1056,13 @@ public class PlayerConnection implements PacketPlayInListener {
if (this.player.dead) return; // CraftBukkit
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);

6
CraftBukkit-Patches/0062-Remove-OS-X-Special-Chars-from-Signs.patch
View file

@ -1,14 +1,14 @@
From f50f2024c1d5ed2fa1a1e3bbb5d4387f4662df84 Mon Sep 17 00:00:00 2001
From 2ec58d554f8e20a7adc0d178d4d320be8bcb2381 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 8 Dec 2013 16:52:42 +1100
Subject: [PATCH] Remove OS X Special Chars from Signs
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d90d332..7264dc5 100644
index aba5cad..22cb0a3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1586,6 +1586,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1582,6 +1582,7 @@ public class PlayerConnection implements PacketPlayInListener {
for (j = 0; j < 4; ++j) {
boolean flag = true;

6
CraftBukkit-Patches/0100-Allow-Disabling-Creative-Item-Filter.patch
View file

@ -1,14 +1,14 @@
From d2c89b878134ac0d1c22b467a1320b305bf93467 Mon Sep 17 00:00:00 2001
From 91ce61222909a0543ab6f2e13f15705e615f41de Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 18:18:01 +1100
Subject: [PATCH] Allow Disabling Creative Item Filter
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 59e98a6..cc7457f 100644
index f778871..aac1449 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1501,7 +1501,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1497,7 +1497,7 @@ public class PlayerConnection implements PacketPlayInListener {
ItemStack itemstack = packetplayinsetcreativeslot.getItemStack();
boolean flag1 = packetplayinsetcreativeslot.c() >= 1 && packetplayinsetcreativeslot.c() < 36 + PlayerInventory.getHotbarSize();
// CraftBukkit - Add invalidItems check

6
CraftBukkit-Patches/0103-Unfinalize-the-isDisconnected-method-by-bukkit.patch
View file

@ -1,4 +1,4 @@
From 341c258ef803001921a1e91a74d36053dd64884f Mon Sep 17 00:00:00 2001
From 9eea6333eb760d6e38a536ffabc0cc91ddf36ca9 Mon Sep 17 00:00:00 2001
From: hcherndon <hcherndon@gmail.com>
Date: Sat, 15 Feb 2014 01:51:20 -0600
Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index cc7457f..652f7a1 100644
index aac1449..e88118f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1887,7 +1887,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1883,7 +1883,7 @@ public class PlayerConnection implements PacketPlayInListener {
}
// CraftBukkit start - Add "isDisconnected" method

6
CraftBukkit-Patches/0119-Fix-several-occurances-of-missed-diff.patch
View file

@ -1,4 +1,4 @@
From fec762e0e6654930be9068e49babcc697e778651 Mon Sep 17 00:00:00 2001
From 335fcf9c78363c270df947932490c1f5bddd224b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 17:49:14 +1000
Subject: [PATCH] Fix several occurances of missed diff.
@ -44,10 +44,10 @@ index 0f1bcc7..5eb893f 100644
public void setItemStack(ItemStack itemstack) {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2f6449e..58ae547 100644
index b1098bb..805d24f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1740,7 +1740,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1736,7 +1736,7 @@ public class PlayerConnection implements PacketPlayInListener {
}
if (itemstack.getItem() == Items.WRITTEN_BOOK && itemstack1.getItem() == Items.BOOK_AND_QUILL) {