Switch 1.12-pre2 to its own version checks
Fix stream formatting issue that had been bugging me
Dieser Commit ist enthalten in:
Ursprung
491286def4
Commit
6e2332a592
@ -0,0 +1,31 @@
|
||||
From eabf0ce918f79ef14c00b9d9c69ba3ddba349feb Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Mon, 15 May 2017 10:11:42 -0500
|
||||
Subject: [PATCH] 1.12-pre2 versioning change and warning
|
||||
|
||||
Remove when merged to master
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||
index aae605e9..d7e3d7f4 100644
|
||||
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
||||
@@ -48,6 +48,7 @@ public class VersionCommand extends BukkitCommand {
|
||||
if (!testPermission(sender)) return true;
|
||||
|
||||
if (args.length == 0) {
|
||||
+ sender.sendMessage("This is pre-release software, and is not necessarily of the same quality as a full release"); // TODO: Remove during merge into master
|
||||
sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
|
||||
sendVersion(sender);
|
||||
} else {
|
||||
@@ -289,7 +290,7 @@ public class VersionCommand extends BukkitCommand {
|
||||
}
|
||||
|
||||
// Contributed by Techcable <Techcable@outlook.com> in GH PR #65
|
||||
- private static final String BRANCH = "master";
|
||||
+ private static final String BRANCH = "pre/1.12"; // TODO: Switch back to master
|
||||
private static int getFromRepo(String repo, String hash) {
|
||||
try {
|
||||
HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + BRANCH + "..." + hash).openConnection();
|
||||
--
|
||||
2.13.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 64acbadada6d70f6748c8f415122555db6ec8e0d Mon Sep 17 00:00:00 2001
|
||||
From 33ffb467efb9f278427de2cda44177f8668cbaf2 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Sun, 22 May 2016 20:20:55 -0500
|
||||
Subject: [PATCH] Optional TNT doesn't move in water
|
||||
@ -60,10 +60,10 @@ index 094891057..5cd82f1b2 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||||
index bb0904f86..ac81808c3 100644
|
||||
index bb0904f86..50811852a 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||||
@@ -147,4 +147,47 @@ public class EntityTNTPrimed extends Entity {
|
||||
@@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {
|
||||
public int getFuseTicks() {
|
||||
return this.c;
|
||||
}
|
||||
@ -100,7 +100,9 @@ index bb0904f86..ac81808c3 100644
|
||||
+ PacketPlayOutEntityVelocity velocityPacket = new PacketPlayOutEntityVelocity(this);
|
||||
+ PacketPlayOutEntityTeleport positionPacket = new PacketPlayOutEntityTeleport(this);
|
||||
+
|
||||
+ ete.trackedPlayers.stream().filter(viewer -> (viewer.locX - this.locX) * (viewer.locY - this.locY) * (viewer.locZ - this.locZ) < 16 * 16).forEach(viewer -> {
|
||||
+ ete.trackedPlayers.stream()
|
||||
+ .filter(viewer -> (viewer.locX - this.locX) * (viewer.locY - this.locY) * (viewer.locZ - this.locZ) < 16 * 16)
|
||||
+ .forEach(viewer -> {
|
||||
+ viewer.playerConnection.sendPacket(velocityPacket);
|
||||
+ viewer.playerConnection.sendPacket(positionPacket);
|
||||
+ });
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren