spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPIGOT-3661: Allow arguments in restart-script

Browse source
This commit is contained in:
md_5 2018-12-27 12:27:36 +11:00
parent 7cc46316ed
commit 29ab5e43ce
9 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From ed43a9a085eb598a92adab05eefac2ab8e895de7 Mon Sep 17 00:00:00 2001
From a022a1b0c81ffc3ded6d441e8b5edba6627d8548 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -141,10 +141,10 @@ index 64e346d84..194d830e1 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 675d5a4ea..f77241361 100644
index b72fd0221..44c74f122 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1630,4 +1630,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1636,4 +1636,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().server.getCommandDispatcher().a(getHandle());
}

6
CraftBukkit-Patches/0030-Player-Collision-API.patch
View file

@ -1,14 +1,14 @@
From 727305c520f1d12766337931e9f34eaf8c4d2b06 Mon Sep 17 00:00:00 2001
From dbcff0629af4861dd4405bbddfef38bf5902b864 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 27 Mar 2016 20:35:09 +1100
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 99226bffd..bd705f075 100644
index f887fdbb6..8bc89ba51 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1635,6 +1635,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1641,6 +1641,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

6
CraftBukkit-Patches/0034-Implement-respawn-API.patch
View file

@ -1,14 +1,14 @@
From 0798ae3571a99d37e9bf7370f5354dcd7033eb8a Mon Sep 17 00:00:00 2001
From ca2f701adb578dc2715cccefc7ff690f7a905d73 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index bd705f075..f626e5672 100644
index 8bc89ba51..352241c41 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1645,6 +1645,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1651,6 +1651,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setCollidesWithEntities(boolean collides) {
CraftPlayer.this.setCollidable(collides);
}

22
CraftBukkit-Patches/0036-Watchdog-Thread.patch
View file

@ -1,4 +1,4 @@
From 63c693895a0c30df3f01013ec69ade9308140480 Mon Sep 17 00:00:00 2001
From c2450d9f56b690e15976c73f2a201659992549f7 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 5 Aug 2014 17:20:19 +0100
Subject: [PATCH] Watchdog Thread.
@ -55,10 +55,10 @@ index acfcafdc5..16c2067fa 100644
public Spigot spigot()
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644
index 000000000..49768734d
index 000000000..f4e088c13
--- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +1,132 @@
@@ -0,0 +1,130 @@
+package org.spigotmc;
+
+import java.io.File;
@ -98,17 +98,18 @@ index 000000000..49768734d
+
+ public static void restart()
+ {
+ restart( new File( SpigotConfig.restartScript ) );
+ restart( SpigotConfig.restartScript );
+ }
+
+ public static void restart(final File script)
+ private static void restart(final String restartScript)
+ {
+ AsyncCatcher.enabled = false; // Disable async catcher incase it interferes with us
+ try
+ {
+ if ( script.isFile() )
+ String[] split = restartScript.split( " " );
+ if ( split.length > 0 && new File( split[0] ).isFile() )
+ {
+ System.out.println( "Attempting to restart with " + SpigotConfig.restartScript );
+ System.out.println( "Attempting to restart with " + restartScript );
+
+ // Disable Watchdog
+ WatchdogThread.doStop();
@ -155,13 +156,10 @@ index 000000000..49768734d
+ String os = System.getProperty( "os.name" ).toLowerCase(java.util.Locale.ENGLISH);
+ if ( os.contains( "win" ) )
+ {
+ Runtime.getRuntime().exec( "cmd /c start " + script.getPath() );
+ Runtime.getRuntime().exec( "cmd /c start " + restartScript );
+ } else
+ {
+ Runtime.getRuntime().exec( new String[]
+ {
+ "sh", script.getPath()
+ } );
+ Runtime.getRuntime().exec( "sh " + restartScript );
+ }
+ } catch ( Exception e )
+ {

6
CraftBukkit-Patches/0039-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From 9048b377c4f68ba86293cff954b7e56ff945b17b Mon Sep 17 00:00:00 2001
From 47c64ccc20d0c0e8d7c93e901e559178e932cfc9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -147,10 +147,10 @@ index 16c2067fa..fe7a82106 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f626e5672..3cadba64c 100644
index 352241c41..e856d52be 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1636,6 +1636,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1642,6 +1642,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private final Player.Spigot spigot = new Player.Spigot()
{

6
CraftBukkit-Patches/0055-Implement-Locale-Getter-for-Players.patch
View file

@ -1,14 +1,14 @@
From 1f98d2af17a0ee60ad72bff7aa6573219dbb45c9 Mon Sep 17 00:00:00 2001
From b9aaddc2661df395ed0b00debb2c207c6e385def Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:12:16 +1100
Subject: [PATCH] Implement Locale Getter for Players
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b77fc6e28..cedab860a 100644
index 335363310..0d9f73f90 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1660,6 +1660,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1666,6 +1666,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), net.minecraft.server.DimensionManager.OVERWORLD, false );
}
}

6
CraftBukkit-Patches/0058-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From 2b4129f30328eefea23bb131a36a9a5170cfe5c2 Mon Sep 17 00:00:00 2001
From d656076c6b8098802c72d09cdb8a6d60c6f8f6f7 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:03:03 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cedab860a..27c2adab4 100644
index 0d9f73f90..3761d5520 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1666,6 +1666,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1672,6 +1672,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
return getHandle().locale;
}

6
CraftBukkit-Patches/0097-Prevent-a-crash-involving-attributes.patch
View file

@ -1,14 +1,14 @@
From b3bb2855d2fe6739b07e6dd965b781b3373387c6 Mon Sep 17 00:00:00 2001
From 962efac959aa685d5e5fd157204fcbb32b300e80 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 19:54:41 +0100
Subject: [PATCH] Prevent a crash involving attributes
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 419c78181..738aa3e0f 100644
index f5ba1104a..b4ee350c5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1498,7 +1498,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1504,7 +1504,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
break;
}
}

6
CraftBukkit-Patches/0112-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From c7a6193bcf8c941cac53145da72199b72dbd37f6 Mon Sep 17 00:00:00 2001
From 83b877f5144218e09eb5059db62fbf83657d97d2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
@ -108,7 +108,7 @@ index 00c159255..2c57a4f03 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 738aa3e0f..b1a5937b1 100644
index b4ee350c5..ab944fc67 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -23,6 +23,7 @@ import java.util.UUID;
@ -119,7 +119,7 @@ index 738aa3e0f..b1a5937b1 100644
import net.minecraft.server.AdvancementDataPlayer;
import net.minecraft.server.AdvancementProgress;
@@ -1687,6 +1688,38 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1693,6 +1694,38 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}