Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-10-05 09:57:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Myles 2020-01-14 19:12:55 +00:00
commit c64c27331a
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/resources/plugin.yml
View File

@ -1,6 +1,6 @@
name: ViaVersion name: ViaVersion
main: us.myles.ViaVersion.ViaVersionPlugin main: us.myles.ViaVersion.ViaVersionPlugin
authors: [_MylesC, Matsv] authors: [_MylesC, creeper123123321, Gerrygames, KennyTV, Matsv]
version: ${project.version} version: ${project.version}
description: ${project.description} description: ${project.description}
load: postworld load: postworld

2
bungee/src/main/resources/bungee.yml
View File

@ -1,5 +1,5 @@
name: ViaVersion name: ViaVersion
main: us.myles.ViaVersion.BungeePlugin main: us.myles.ViaVersion.BungeePlugin
description: ${project.description} description: ${project.description}
author: _MylesC, Matsv author: _MylesC, creeper123123321, Gerrygames, KennyTV, Matsv
version: ${project.version} version: ${project.version}

4
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java
View File

@ -189,10 +189,10 @@ public class WorldPackets {
int id = section.getFlatBlock(x, y, z); int id = section.getFlatBlock(x, y, z);
if (id != AIR && id != VOID_AIR && id != CAVE_AIR) { if (id != AIR && id != VOID_AIR && id != CAVE_AIR) {
nonAirBlockCount++; nonAirBlockCount++;
worldSurface[x + z * 16] = y + s * 16 + 2; // Should be +1 (top of the block) but +2 works :tm: worldSurface[x + z * 16] = y + s * 16 + 1; // +1 (top of the block)
} }
if (MappingData.motionBlocking.contains(id)) { if (MappingData.motionBlocking.contains(id)) {
motionBlocking[x + z * 16] = y + s * 16 + 2; // Should be +1 (top of the block) but +2 works :tm: motionBlocking[x + z * 16] = y + s * 16 + 1; // +1 (top of the block)
} }
// Manually update light for non full blocks (block light must not be sent) // Manually update light for non full blocks (block light must not be sent)

2
sponge/src/main/java/us/myles/ViaVersion/SpongePlugin.java
View File

@ -38,7 +38,7 @@ import java.util.logging.Logger;
@Plugin(id = "viaversion", @Plugin(id = "viaversion",
name = "ViaVersion", name = "ViaVersion",
version = VersionInfo.VERSION, version = VersionInfo.VERSION,
authors = {"_MylesC", "Matsv"}, authors = {"_MylesC", "creeper123123321", "Gerrygames", "KennyTV", "Matsv"},
description = "Allow newer Minecraft versions to connect to an older server version." description = "Allow newer Minecraft versions to connect to an older server version."
) )
public class SpongePlugin implements ViaPlatform { public class SpongePlugin implements ViaPlatform {

5
sponge/src/main/resources/mcmod.info
View File

@ -6,7 +6,10 @@
"description": "${project.description}", "description": "${project.description}",
"authorList": [ "authorList": [
"_MylesC", "_MylesC",
"Matsv" "creeper123123321",
"Gerrygames",
"KennyTV",
"Matsv"
], ],
"logoFile": "assets/viaversion/textures/logo.png" "logoFile": "assets/viaversion/textures/logo.png"
} }

2
velocity/src/main/java/us/myles/ViaVersion/VelocityPlugin.java
View File

@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit;
id = "viaversion", id = "viaversion",
name = "ViaVersion", name = "ViaVersion",
version = VersionInfo.VERSION, version = VersionInfo.VERSION,
authors = {"_MylesC", "Matsv"}, authors = {"_MylesC", "creeper123123321", "Gerrygames", "KennyTV", "Matsv"},
description = "Allow newer Minecraft versions to connect to an older server version.", description = "Allow newer Minecraft versions to connect to an older server version.",
url = "https://viaversion.com" url = "https://viaversion.com"
) )