SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MC Utils

Browse Source 
== AT ==
public net.minecraft.server.level.ServerChunkCache mainThread
public net.minecraft.server.level.ServerLevel chunkSource
public org.bukkit.craftbukkit.inventory.CraftItemStack handle
public net.minecraft.server.level.ChunkMap getVisibleChunkIfPresent(J)Lnet/minecraft/server/level/ChunkHolder;
public net.minecraft.server.level.ServerChunkCache mainThreadProcessor
public net.minecraft.server.level.ServerChunkCache$MainThreadExecutor
public net.minecraft.world.level.chunk.LevelChunkSection states
This commit is contained in:
Aikar
2016-03-28 20:55:47 -04:00
parent a82a09d198
commit b01c811c2f
81 changed files with 6261 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
paper-server/patches/sources/net/minecraft/server/players/PlayerList.java.patch
View File

@@ -90,8 +90,11 @@
this.server = server;
this.registries = registryManager;
this.maxPlayers = maxPlayers;
@@ -150,25 +183,34 @@
@@ -148,27 +181,37 @@
}
public void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie clientData) {
+ player.isRealPlayer = true; // Paper
GameProfile gameprofile = player.getGameProfile();
GameProfileCache usercache = this.server.getProfileCache();
- Optional optional;
@@ -130,7 +133,7 @@
ServerLevel worldserver = this.server.getLevel(resourcekey);
ServerLevel worldserver1;
@@ -182,10 +224,24 @@
@@ -182,10 +225,24 @@
player.setServerLevel(worldserver1);
String s1 = connection.getLoggableAddress(this.server.logIPs());
@@ -157,7 +160,7 @@
ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, clientData);
connection.setupInboundProtocol(GameProtocols.SERVERBOUND_TEMPLATE.bind(RegistryFriendlyByteBuf.decorator(this.server.registryAccess())), playerconnection);
@@ -194,7 +250,9 @@
@@ -194,7 +251,9 @@
boolean flag1 = gamerules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
boolean flag2 = gamerules.getBoolean(GameRules.RULE_LIMITED_CRAFTING);
@@ -168,7 +171,7 @@
playerconnection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
playerconnection.send(new ClientboundPlayerAbilitiesPacket(player.getAbilities()));
playerconnection.send(new ClientboundSetHeldSlotPacket(player.getInventory().selected));
@@ -213,8 +271,10 @@
@@ -213,8 +272,10 @@
} else {
ichatmutablecomponent = Component.translatable("multiplayer.player.joined.renamed", player.getDisplayName(), s);
}
@@ -180,7 +183,7 @@
playerconnection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
ServerStatus serverping = this.server.getStatus();
@@ -222,17 +282,71 @@
@@ -222,17 +283,71 @@
player.sendServerStatus(serverping);
}
@@ -256,7 +259,7 @@
}
public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) {
@@ -269,30 +383,31 @@
@@ -269,30 +384,31 @@
}
public void addWorldborderListener(ServerLevel world) {
@@ -293,7 +296,7 @@
}
@Override
@@ -319,14 +434,15 @@
@@ -319,14 +435,15 @@
}
protected void save(ServerPlayer player) {
@@ -311,7 +314,7 @@
if (advancementdataplayer != null) {
advancementdataplayer.save();
@@ -334,95 +450,176 @@
@@ -334,95 +451,176 @@
}
@@ -527,7 +530,7 @@
if (entityplayer1 != null) {
set.add(entityplayer1);
@@ -431,30 +628,50 @@
@@ -431,30 +629,50 @@
Iterator iterator1 = set.iterator();
while (iterator1.hasNext()) {
@@ -591,7 +594,7 @@
while (iterator.hasNext()) {
String s = (String) iterator.next();
@@ -462,41 +679,87 @@
@@ -462,41 +680,88 @@
entityplayer1.addTag(s);
}
@@ -617,6 +620,7 @@
- entityplayer1.moveTo(vec3d.x, vec3d.y, vec3d.z, teleporttransition.yRot(), teleporttransition.xRot());
+ entityplayer1.forceSetPositionRotation(vec3d.x, vec3d.y, vec3d.z, teleporttransition.yRot(), teleporttransition.xRot());
+ worldserver.getChunkSource().addRegionTicket(net.minecraft.server.level.TicketType.POST_TELEPORT, new net.minecraft.world.level.ChunkPos(net.minecraft.util.Mth.floor(vec3d.x()) >> 4, net.minecraft.util.Mth.floor(vec3d.z()) >> 4), 1, entityplayer.getId()); // Paper - post teleport ticket type
+ // CraftBukkit end
if (teleporttransition.missingRespawnBlock()) {
entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
@@ -687,7 +691,7 @@
return entityplayer1;
}
@@ -524,7 +787,18 @@
@@ -524,7 +789,18 @@
public void tick() {
if (++this.sendAllPlayerInfoIn > 600) {
@@ -707,7 +711,7 @@
this.sendAllPlayerInfoIn = 0;
}
@@ -541,6 +815,25 @@
@@ -541,6 +817,25 @@
}
@@ -733,7 +737,7 @@
public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
Iterator iterator = this.players.iterator();
@@ -554,7 +847,7 @@
@@ -554,7 +849,7 @@
}
@@ -742,7 +746,7 @@
PlayerTeam scoreboardteam = source.getTeam();
if (scoreboardteam != null) {
@@ -573,7 +866,7 @@
@@ -573,7 +868,7 @@
}
}
@@ -751,7 +755,7 @@
PlayerTeam scoreboardteam = source.getTeam();
if (scoreboardteam == null) {
@@ -619,7 +912,7 @@
@@ -619,7 +914,7 @@
}
public void deop(GameProfile profile) {
@@ -760,7 +764,7 @@
ServerPlayer entityplayer = this.getPlayer(profile.getId());
if (entityplayer != null) {
@@ -643,6 +936,7 @@
@@ -643,6 +938,7 @@
player.connection.send(new ClientboundEntityEventPacket(player, b0));
}
@@ -768,7 +772,7 @@
this.server.getCommands().sendCommands(player);
}
@@ -656,23 +950,19 @@
@@ -656,23 +952,19 @@
@Nullable
public ServerPlayer getPlayerByName(String name) {
@@ -800,7 +804,7 @@
if (entityplayer != player && entityplayer.level().dimension() == worldKey) {
double d4 = x - entityplayer.getX();
double d5 = y - entityplayer.getY();
@@ -712,15 +1002,19 @@
@@ -712,15 +1004,19 @@
public void reloadWhiteList() {}
public void sendLevelInfo(ServerPlayer player, ServerLevel world) {
@@ -824,7 +828,7 @@
}
player.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.LEVEL_CHUNKS_LOAD_START, 0.0F));
@@ -729,8 +1023,16 @@
@@ -729,8 +1025,16 @@
public void sendAllPlayerInfo(ServerPlayer player) {
player.inventoryMenu.sendAllDataToRemote();
@@ -842,7 +846,7 @@
}
public int getPlayerCount() {
@@ -786,12 +1088,22 @@
@@ -786,12 +1090,22 @@
}
public void removeAll() {
@@ -867,7 +871,7 @@
public void broadcastSystemMessage(Component message, boolean overlay) {
this.broadcastSystemMessage(message, (entityplayer) -> {
return message;
@@ -849,16 +1161,23 @@
@@ -849,16 +1163,23 @@
return message.hasSignature() && !message.hasExpiredServer(Instant.now());
}
@@ -895,7 +899,7 @@
Path path = file2.toPath();
if (FileUtil.isPathNormalized(path) && FileUtil.isPathPortable(path) && path.startsWith(file.getPath()) && file2.isFile()) {
@@ -867,7 +1186,7 @@
@@ -867,7 +1188,7 @@
}
serverstatisticmanager = new ServerStatsCounter(this.server, file1);
@@ -904,7 +908,7 @@
}
return serverstatisticmanager;
@@ -875,13 +1194,13 @@
@@ -875,13 +1196,13 @@
public PlayerAdvancements getPlayerAdvancements(ServerPlayer player) {
UUID uuid = player.getUUID();
@@ -920,7 +924,7 @@
}
advancementdataplayer.setPlayer(player);
@@ -932,15 +1251,28 @@
@@ -932,15 +1253,28 @@
}
public void reloadResources() {