Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolve conflict

Browse Source
This commit is contained in:
Sotr
2019-03-21 03:01:05 +08:00
parent 1f6332e3d4 6498e68a50
commit 6436a5f9b1
29 changed files with 263 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/bukkit/craftbukkit/Main.java
View File

@@ -173,8 +173,8 @@ public class Main {
}
float javaVersion = Float.parseFloat(System.getProperty("java.class.version"));
if (javaVersion > 55.0) {
System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 11 is supported.");
if (javaVersion > 56.0) {
System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 12 is supported.");
return;
}

2
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View File

@@ -168,7 +168,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
return false;
}
if (getHandle().a(blockposition) != EntityHuman.EnumBedResult.OK) {
if (getHandle().a(blockposition, force) != EntityHuman.EnumBedResult.OK) {
return false;
}

8
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -369,20 +369,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setPlayerListHeader(String header) {
this.playerListHeader = CraftChatMessage.fromStringOrNull(header, true); // Paper - fix up spigot tab API
this.playerListHeader = CraftChatMessage.fromStringOrNull(header, true);
updatePlayerListHeaderFooter();
}
@Override
public void setPlayerListFooter(String footer) {
this.playerListFooter = CraftChatMessage.fromStringOrNull(footer, true); // Paper - fix up spigot tab API
this.playerListFooter = CraftChatMessage.fromStringOrNull(footer, true);
updatePlayerListHeaderFooter();
}
@Override
public void setPlayerListHeaderFooter(String header, String footer) {
this.playerListHeader = CraftChatMessage.fromStringOrNull(header, true); // Paper - fix up spigot tab API
this.playerListFooter = CraftChatMessage.fromStringOrNull(footer, true); // Paper - fix up spigot tab API
this.playerListHeader = CraftChatMessage.fromStringOrNull(header, true);
this.playerListFooter = CraftChatMessage.fromStringOrNull(footer, true);
updatePlayerListHeaderFooter();
}

2
src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
View File

@@ -143,13 +143,11 @@ public final class CraftChatMessage {
}
public static IChatBaseComponent fromStringOrNull(String message) {
// Paper start - fix up spigot tab API
return fromStringOrNull(message, false);
}
public static IChatBaseComponent fromStringOrNull(String message, boolean keepNewlines) {
return (message == null || message.isEmpty()) ? null : fromString(message, keepNewlines)[0];
// Paper end - fix up spigot tab API
}
public static IChatBaseComponent[] fromString(String message) {

2
src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
View File

@@ -160,7 +160,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
* @return string
*/
public String getMappingsVersion() {
return "00ed8e5c39debc3ed194ad7c5645cc45";
return "7dd4b3ec31629620c41553e5c142e454";
}
@Override