Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-09-07 00:22:51 +02:00
[Forge] Update to 1.11.2
Dieser Commit ist enthalten in:
Ursprung
000c23827c
Commit
537c6694e1
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binäre Datei nicht angezeigt.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Wed Nov 23 21:39:25 PST 2016
|
#Wed Feb 22 23:32:37 PST 2017
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip
|
||||||
|
11
gradlew
vendored
11
gradlew
vendored
@ -155,13 +155,14 @@ if $cygwin ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Escape application args
|
# Escape application args
|
||||||
for s in "${@}" ; do
|
save ( ) {
|
||||||
s=\"$s\"
|
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||||
APP_ARGS=$APP_ARGS" "$s
|
echo " "
|
||||||
done
|
}
|
||||||
|
APP_ARGS=$(save "$@")
|
||||||
|
|
||||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||||
eval set -- "$DEFAULT_JVM_OPTS" "$JAVA_OPTS" "$GRADLE_OPTS" "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||||
|
|
||||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||||
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
||||||
|
@ -26,11 +26,11 @@ repositories {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ext.forgeVersion = "13.19.1.2189"
|
ext.forgeVersion = "13.20.0.2237"
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "1.11-${project.forgeVersion}"
|
version = "1.11.2-${project.forgeVersion}"
|
||||||
mappings = "snapshot_20161209"
|
mappings = "snapshot_20170221"
|
||||||
runDir = 'run'
|
runDir = 'run'
|
||||||
|
|
||||||
replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java"
|
replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java"
|
||||||
|
@ -278,7 +278,7 @@ public class ForgeWorld extends AbstractWorld {
|
|||||||
AnvilSaveHandler saveHandler = new AnvilSaveHandler(saveFolder,
|
AnvilSaveHandler saveHandler = new AnvilSaveHandler(saveFolder,
|
||||||
originalWorld.getSaveHandler().getWorldDirectory().getName(), true, server.getDataFixer());
|
originalWorld.getSaveHandler().getWorldDirectory().getName(), true, server.getDataFixer());
|
||||||
World freshWorld = new WorldServer(server, saveHandler, originalWorld.getWorldInfo(),
|
World freshWorld = new WorldServer(server, saveHandler, originalWorld.getWorldInfo(),
|
||||||
originalWorld.provider.getDimension(), originalWorld.theProfiler).init();
|
originalWorld.provider.getDimension(), originalWorld.profiler).init();
|
||||||
|
|
||||||
// Pre-gen all the chunks
|
// Pre-gen all the chunks
|
||||||
// We need to also pull one more chunk in every direction
|
// We need to also pull one more chunk in every direction
|
||||||
|
@ -67,6 +67,6 @@ public class WECUIPacketHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static EntityPlayerMP getPlayerFromEvent(ServerCustomPacketEvent event) {
|
private static EntityPlayerMP getPlayerFromEvent(ServerCustomPacketEvent event) {
|
||||||
return ((NetHandlerPlayServer) event.getHandler()).playerEntity;
|
return ((NetHandlerPlayServer) event.getHandler()).player;
|
||||||
}
|
}
|
||||||
}
|
}
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren