Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix broken patch + document edit command

This commit is contained in:
Jamie Mansfield 2018-07-21 18:47:04 +01:00
parent 126c0d88dd
commit c97fa453e1
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch
View File

@ -6,11 +6,7 @@ Subject: [PATCH] Get rid of the security manager.
There's a lot of opinions running on both sides of the debate, but we overwhelmingly feel that the security manager does not help the vast majority of BungeeCord users or plugin developers create correct code.
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
<<<<<<< HEAD:BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch
index e62b5259..8a4f747c 100644
=======
index a7dcc97..a0708a6 100644
>>>>>>> a388864... Add waterfall command:BungeeCord-Patches/0006-Get-rid-of-the-security-manager.patch
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -185,8 +185,6 @@ public class BungeeCord extends ProxyServer

7
waterfall
View File

@ -21,10 +21,11 @@ case "$1" in
echo "build. View below for details of the available commands."
echo ""
echo "Commands:"
echo " * rb, rbp, rebuild | Rebuilds the patches."
echo " * p, patch | Applies all the patches to BungeeCord."
echo " * m, merge | Utility to aid in merging upstream"
echo " * rb, rbp, rebuild | Rebuilds the patches"
echo " * p, patch | Applies all the patches to BungeeCord"
echo " * m, up, merge | Utility to aid in merging upstream"
echo " * b, build | Builds the project"
echo " | The bootstrap artifact can be found in Waterfall-Proxy/bootstrap/target/"
echo " * e, edit | Runs git rebase -i for Waterfall, allowing patches to be easily modified"
;;
esac