Did some things...
This commit is contained in:
parent
fedbf2bc8f
commit
3f5eef8c30
|
@ -1261,7 +1261,7 @@ public class Minecraft implements IThreadListener {
|
|||
this.mcProfiler.endStartSection("textures");
|
||||
if (!this.isGamePaused) {
|
||||
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) {
|
||||
|
|
|
@ -258,6 +258,7 @@ public class Scoreboard {
|
|||
* memberships and broadcasts the deletion to all players
|
||||
*/
|
||||
public void removeTeam(ScorePlayerTeam parScorePlayerTeam) {
|
||||
if(parScorePlayerTeam != null) {
|
||||
this.teams.remove(parScorePlayerTeam.getRegisteredName());
|
||||
|
||||
for (String s : parScorePlayerTeam.getMembershipCollection()) {
|
||||
|
@ -266,6 +267,7 @@ public class Scoreboard {
|
|||
|
||||
this.func_96513_c(parScorePlayerTeam);
|
||||
}
|
||||
}
|
||||
|
||||
/**+
|
||||
* Adds a player to the given team
|
||||
|
@ -303,15 +305,15 @@ public class Scoreboard {
|
|||
* is thrown.
|
||||
*/
|
||||
public void removePlayerFromTeam(String parString1, ScorePlayerTeam parScorePlayerTeam) {
|
||||
if(parScorePlayerTeam != null) {
|
||||
if (this.getPlayersTeam(parString1) != parScorePlayerTeam) {
|
||||
throw new IllegalStateException(
|
||||
"Player is either on another team or not on any team. Cannot remove from team \'"
|
||||
+ parScorePlayerTeam.getRegisteredName() + "\'.");
|
||||
throw new IllegalStateException("Player is either on another team or not on any team. Cannot remove from team \'" + parScorePlayerTeam.getRegisteredName() + "\'.");
|
||||
} else {
|
||||
this.teamMemberships.remove(parString1);
|
||||
parScorePlayerTeam.getMembershipCollection().remove(parString1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**+
|
||||
* Retrieve all registered ScorePlayerTeam names
|
||||
|
|
Loading…
Reference in New Issue
Block a user