GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/floodgate-merge

Browse source 
# Conflicts:
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
This commit is contained in:
Tim203 2024-03-18 16:38:52 +01:00
commit 120b367a41
No known key found for this signature in database
48 changed files with 12785 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
View file

@ -444,7 +444,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
return false;
}
for (int i = protocolList.size() - 1; i >= 0; i--) {
MappingData mappingData = protocolList.get(i).getProtocol().getMappingData();
MappingData mappingData = protocolList.get(i).protocol().getMappingData();
if (mappingData != null) {
return true;
}