3rdparty/peytonplayz585-shadow-3.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Did some things...

Browse Source
This commit is contained in:
peytonplayz595 2023-09-10 07:35:51 -05:00
parent fedbf2bc8f
commit 3f5eef8c30
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/client/Minecraft.java
View File

@ -1261,7 +1261,7 @@ public class Minecraft implements IThreadListener {
this.mcProfiler.endStartSection("textures"); this.mcProfiler.endStartSection("textures");
if (!this.isGamePaused) { if (!this.isGamePaused) {
this.renderEngine.tick(); this.renderEngine.tick();
GlStateManager.viewport(0, 0, displayWidth, displayHeight); // to be safe //GlStateManager.viewport(0, 0, displayWidth, displayHeight); // to be safe
} }
if (this.currentScreen == null && this.thePlayer != null) { if (this.currentScreen == null && this.thePlayer != null) {

26
src/main/java/net/minecraft/scoreboard/Scoreboard.java
View File

@ -258,13 +258,15 @@ public class Scoreboard {
* memberships and broadcasts the deletion to all players * memberships and broadcasts the deletion to all players
*/ */
public void removeTeam(ScorePlayerTeam parScorePlayerTeam) { public void removeTeam(ScorePlayerTeam parScorePlayerTeam) {
this.teams.remove(parScorePlayerTeam.getRegisteredName()); if(parScorePlayerTeam != null) {
this.teams.remove(parScorePlayerTeam.getRegisteredName());
for (String s : parScorePlayerTeam.getMembershipCollection()) { for (String s : parScorePlayerTeam.getMembershipCollection()) {
this.teamMemberships.remove(s); this.teamMemberships.remove(s);
}
this.func_96513_c(parScorePlayerTeam);
} }
this.func_96513_c(parScorePlayerTeam);
} }
/**+ /**+
@ -303,13 +305,13 @@ public class Scoreboard {
* is thrown. * is thrown.
*/ */
public void removePlayerFromTeam(String parString1, ScorePlayerTeam parScorePlayerTeam) { public void removePlayerFromTeam(String parString1, ScorePlayerTeam parScorePlayerTeam) {
if (this.getPlayersTeam(parString1) != parScorePlayerTeam) { if(parScorePlayerTeam != null) {
throw new IllegalStateException( if (this.getPlayersTeam(parString1) != parScorePlayerTeam) {
"Player is either on another team or not on any team. Cannot remove from team \'" throw new IllegalStateException("Player is either on another team or not on any team. Cannot remove from team \'" + parScorePlayerTeam.getRegisteredName() + "\'.");
+ parScorePlayerTeam.getRegisteredName() + "\'."); } else {
} else { this.teamMemberships.remove(parString1);
this.teamMemberships.remove(parString1); parScorePlayerTeam.getMembershipCollection().remove(parString1);
parScorePlayerTeam.getMembershipCollection().remove(parString1); }
} }
} }