Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-16 13:00:06 +01:00
Upstream merge
Dieser Commit ist enthalten in:
md_5
Ursprung
b03273a347
Commit
cc7903bbf3
@ -1 +1 @@
|
||||
Subproject commit 7e1ac0a77129b169704c1e222ff2deb3ab6cd2d2
|
||||
Subproject commit 89974e188c4c5c7758a4e76689f52a9f96f6c01e
|
||||
@ -1,4 +1,4 @@
|
||||
From 0fb4b4d5c11cbd1aa4d4143accc986954f0fea1a Mon Sep 17 00:00:00 2001
|
||||
From ea9533f887254b6ec417d9e69a0eb81b9676c7ad 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
|
||||
@ -142,10 +142,10 @@ index 2afdff4..a77fec8 100644
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index caa184e..a478ee9 100644
|
||||
index 362b507..15a5a5d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -225,7 +225,7 @@ public final class CraftServer implements Server {
|
||||
@@ -224,7 +224,7 @@ public final class CraftServer implements Server {
|
||||
loadIcon();
|
||||
|
||||
updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
From 5a795c69a696f3a4817dd22c16cc526937e30410 Mon Sep 17 00:00:00 2001
|
||||
From 226d8a6df344512bb7d00f969d8b096d2d8c3fd9 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 7 Jul 2013 09:32:53 +1000
|
||||
Subject: [PATCH] Spigot Configuration
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index 03585b7..086f49e 100644
|
||||
index 30ce5f4..c9bb3a6 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -102,6 +102,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
@@ -109,6 +109,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
if (this.J() < 0) {
|
||||
this.setPort(this.propertyManager.getInt("server-port", 25565));
|
||||
}
|
||||
@ -20,7 +20,7 @@ index 03585b7..086f49e 100644
|
||||
|
||||
h.info("Generating keypair");
|
||||
this.a(MinecraftEncryption.b());
|
||||
@@ -116,7 +121,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
@@ -123,7 +128,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -54,10 +54,10 @@ index 67247f6..9357eb9 100644
|
||||
this.world = new CraftWorld((WorldServer) this, gen, env);
|
||||
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index a478ee9..5eefd0d 100644
|
||||
index 15a5a5d..93e1782 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -231,8 +231,10 @@ public final class CraftServer implements Server {
|
||||
@@ -230,8 +230,10 @@ public final class CraftServer implements Server {
|
||||
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
|
||||
updater.check(serverVersion);
|
||||
|
||||
@ -70,7 +70,7 @@ index a478ee9..5eefd0d 100644
|
||||
}
|
||||
|
||||
private File getConfigFile() {
|
||||
@@ -582,6 +584,7 @@ public final class CraftServer implements Server {
|
||||
@@ -581,6 +583,7 @@ public final class CraftServer implements Server {
|
||||
playerList.getIPBans().load();
|
||||
playerList.getNameBans().load();
|
||||
|
||||
@ -78,7 +78,7 @@ index a478ee9..5eefd0d 100644
|
||||
for (WorldServer world : console.worlds) {
|
||||
world.difficulty = difficulty;
|
||||
world.setSpawnFlags(monsters, animals);
|
||||
@@ -596,11 +599,13 @@ public final class CraftServer implements Server {
|
||||
@@ -595,11 +598,13 @@ public final class CraftServer implements Server {
|
||||
} else {
|
||||
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 34d90bfbf38c020b7e10bb1fa2d3d95090f1a687 Mon Sep 17 00:00:00 2001
|
||||
From 68903a9fb06c84df81f3b9aaeb0bc988aec38ad9 Mon Sep 17 00:00:00 2001
|
||||
From: Antony Riley <antony@cyberiantiger.org>
|
||||
Date: Wed, 27 Mar 2013 01:41:54 +0200
|
||||
Subject: [PATCH] Close Unloaded Save Files
|
||||
@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644
|
||||
public static synchronized RegionFile a(File file1, int i, int j) {
|
||||
File file2 = new File(file1, "region");
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 5eefd0d..5f5174b 100644
|
||||
index 93e1782..13c1bbe 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -41,6 +41,8 @@ import net.minecraft.server.MinecraftServer;
|
||||
@ -30,7 +30,7 @@ index 5eefd0d..5f5174b 100644
|
||||
import net.minecraft.server.ServerNBTManager;
|
||||
import net.minecraft.server.WorldLoaderServer;
|
||||
import net.minecraft.server.WorldManager;
|
||||
@@ -850,6 +852,30 @@ public final class CraftServer implements Server {
|
||||
@@ -849,6 +851,30 @@ public final class CraftServer implements Server {
|
||||
worlds.remove(world.getName().toLowerCase());
|
||||
console.worlds.remove(console.worlds.indexOf(handle));
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 870c6576bc2ca87279d6032b2caf5b9c99589fc7 Mon Sep 17 00:00:00 2001
|
||||
From 9c61bb156390398f037c340ed15b7419a90f02c0 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 16 Jun 2013 08:20:26 +1000
|
||||
Subject: [PATCH] Do Not Search for Offline Players
|
||||
@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players
|
||||
By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 5f5174b..33cadfe 100644
|
||||
index 13c1bbe..11f018b 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1132,7 +1132,7 @@ public final class CraftServer implements Server {
|
||||
@@ -1131,7 +1131,7 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
public OfflinePlayer getOfflinePlayer(String name) {
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
From 023d1d6f29e1a600596f9cbcfd871b67c5fb0301 Mon Sep 17 00:00:00 2001
|
||||
From b87bcabe08a52c31fa67fa8cdaed3ceb8842da70 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Fri, 21 Jun 2013 18:05:54 +1000
|
||||
Subject: [PATCH] Allow Disabling of Command TabComplete
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 33cadfe..5178808 100644
|
||||
index 11f018b..abe05dc 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1399,7 +1399,7 @@ public final class CraftServer implements Server {
|
||||
@@ -1398,7 +1398,7 @@ public final class CraftServer implements Server {
|
||||
public List<String> tabCompleteCommand(Player player, String message) {
|
||||
List<String> completions = null;
|
||||
try {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d54f156ceae783962b48ffd878aa9a7634fcd00d Mon Sep 17 00:00:00 2001
|
||||
From 0d0356e87624e867a525ca00fa12f45f09fe41d1 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Fri, 21 Jun 2013 19:21:58 +1000
|
||||
Subject: [PATCH] Configurable Messages
|
||||
@ -23,7 +23,7 @@ index b7f6775..b96e2ef 100644
|
||||
this.b.a((IChatBaseComponent) chatcomponenttext);
|
||||
} else {
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 196ac4f..b10b9a7 100644
|
||||
index f3294b0..81dbf37 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -335,7 +335,7 @@ public abstract class PlayerList {
|
||||
@ -45,10 +45,10 @@ index 196ac4f..b10b9a7 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 5178808..82a566d 100644
|
||||
index abe05dc..be43d4b 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -548,11 +548,7 @@ public final class CraftServer implements Server {
|
||||
@@ -547,11 +547,7 @@ public final class CraftServer implements Server {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
From 55f17d7a2a29d0d8f377748eedc53f6425253e7a Mon Sep 17 00:00:00 2001
|
||||
From 4f2f1f5b626323a15226c3ac2791a11f732f19bb Mon Sep 17 00:00:00 2001
|
||||
From: Thinkofdeath <purggames@gmail.com>
|
||||
Date: Sun, 1 Dec 2013 10:33:55 +0000
|
||||
Subject: [PATCH] Fix links in chat
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
|
||||
index 2e163f2..7d1ad13 100644
|
||||
index cc8e715..a786da9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
|
||||
@@ -3,11 +3,15 @@ package org.bukkit.craftbukkit.util;
|
||||
@ -32,8 +32,8 @@ index 2e163f2..7d1ad13 100644
|
||||
|
||||
private FromString(String message) {
|
||||
if (message == null) {
|
||||
@@ -37,6 +42,8 @@ public final class CraftChatMessage {
|
||||
}
|
||||
@@ -38,6 +43,8 @@ public final class CraftChatMessage {
|
||||
list.add(currentChatComponent);
|
||||
|
||||
EnumChatFormat format = null;
|
||||
+ Matcher matcher = url.matcher(message);
|
||||
@ -41,9 +41,9 @@ index 2e163f2..7d1ad13 100644
|
||||
|
||||
for (int i = 0; i < message.length(); i++) {
|
||||
char currentChar = message.charAt(i);
|
||||
@@ -76,6 +83,28 @@ public final class CraftChatMessage {
|
||||
finishComponent();
|
||||
@@ -78,6 +85,28 @@ public final class CraftChatMessage {
|
||||
}
|
||||
currentChatComponent = null;
|
||||
} else {
|
||||
+ if (currentChar == ' ' || i == message.length() - 1) {
|
||||
+ Matcher urlMatcher = matcher.region(lastWord, i == message.length() - 1 ? message.length() : i);
|
||||
@ -62,7 +62,7 @@ index 2e163f2..7d1ad13 100644
|
||||
+ appendNewComponent();
|
||||
+ modifier.a((ChatClickable) null);
|
||||
+ if (i == message.length() - 1) {
|
||||
+ finishComponent();
|
||||
+ appendNewComponent();
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
@ -71,5 +71,5 @@ index 2e163f2..7d1ad13 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
1.8.4.msysgit.0
|
||||
1.8.3.2
|
||||
|
||||
|
||||
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren