Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-04 11:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #382 from sk89q/feature/forge-1.11.2

Browse Source 
[Forge] Update to 1.11.2
This commit is contained in:
Kenzie Togami 2017-02-23 08:32:29 -08:00 committed by GitHub
commit a4455e875e
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Nov 23 21:39:25 PST 2016
#Wed Feb 22 23:32:37 PST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
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
View File

@ -155,13 +155,14 @@ if $cygwin ; then
fi
# Escape application args
for s in "${@}" ; do
s=\"$s\"
APP_ARGS=$APP_ARGS" "$s
done
save ( ) {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
# 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
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then

6
worldedit-forge/build.gradle
View File

@ -26,11 +26,11 @@ repositories {
}
}
ext.forgeVersion = "13.19.1.2189"
ext.forgeVersion = "13.20.0.2237"
minecraft {
version = "1.11-${project.forgeVersion}"
mappings = "snapshot_20161209"
version = "1.11.2-${project.forgeVersion}"
mappings = "snapshot_20170221"
runDir = 'run'
replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java"

2
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java
View File

@ -278,7 +278,7 @@ public class ForgeWorld extends AbstractWorld {
AnvilSaveHandler saveHandler = new AnvilSaveHandler(saveFolder,
originalWorld.getSaveHandler().getWorldDirectory().getName(), true, server.getDataFixer());
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
// We need to also pull one more chunk in every direction

2
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/WECUIPacketHandler.java
View File

@ -67,6 +67,6 @@ public class WECUIPacketHandler {
}
private static EntityPlayerMP getPlayerFromEvent(ServerCustomPacketEvent event) {
return ((NetHandlerPlayServer) event.getHandler()).playerEntity;
return ((NetHandlerPlayServer) event.getHandler()).player;
}
}